Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e015268d authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: remove traces of urb->status from usbcore 



This patch (as981) removes the remaining nontrivial usages of
urb->status from usbcore.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1431d2a4

drivers/usb/core/devio.c

+5 −3
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ struct async { 
	void __user *userbuffer;

	void __user *userurb;

	struct urb *urb;

	int status;

	u32 secid;

};
@@ -310,9 +311,10 @@ static void async_completed(struct urb *urb) 
        spin_lock(&ps->lock);

        list_move_tail(&as->asynclist, &ps->async_completed);

        spin_unlock(&ps->lock);

	as->status = urb->status;

	if (as->signr) {

		sinfo.si_signo = as->signr;

		sinfo.si_errno = as->urb->status;

		sinfo.si_errno = as->status;

		sinfo.si_code = SI_ASYNCIO;

		sinfo.si_addr = as->userurb;

		kill_pid_info_as_uid(as->signr, &sinfo, as->pid, as->uid,
@@ -1132,7 +1134,7 @@ static int processcompl(struct async *as, void __user * __user *arg) 
	if (as->userbuffer)

		if (copy_to_user(as->userbuffer, urb->transfer_buffer, urb->transfer_buffer_length))

			return -EFAULT;

	if (put_user(urb->status, &userurb->status))

	if (put_user(as->status, &userurb->status))

		return -EFAULT;

	if (put_user(urb->actual_length, &userurb->actual_length))

		return -EFAULT;
@@ -1246,7 +1248,7 @@ static int processcompl_compat(struct async *as, void __user * __user *arg) 
	if (as->userbuffer)

		if (copy_to_user(as->userbuffer, urb->transfer_buffer, urb->transfer_buffer_length))

			return -EFAULT;

	if (put_user(urb->status, &userurb->status))

	if (put_user(as->status, &userurb->status))

		return -EFAULT;

	if (put_user(urb->actual_length, &userurb->actual_length))

		return -EFAULT;

drivers/usb/core/hub.c

+4 −4
Original line number Diff line number Diff line
@@ -347,11 +347,11 @@ void usb_kick_khubd(struct usb_device *hdev) 
static void hub_irq(struct urb *urb)

{

	struct usb_hub *hub = urb->context;

	int status;

	int status = urb->status;

	int i;

	unsigned long bits;



	switch (urb->status) {

	switch (status) {

	case -ENOENT:		/* synchronous unlink */

	case -ECONNRESET:	/* async unlink */

	case -ESHUTDOWN:	/* hardware going away */
@@ -359,10 +359,10 @@ static void hub_irq(struct urb *urb) 


	default:		/* presumably an error */

		/* Cause a hub reset after 10 consecutive errors */

		dev_dbg (hub->intfdev, "transfer --> %d\n", urb->status);

		dev_dbg (hub->intfdev, "transfer --> %d\n", status);

		if ((++hub->nerrors < 10) || hub->error)

			goto resubmit;

		hub->error = urb->status;

		hub->error = status;

		/* FALL THROUGH */



	/* let khubd handle things */