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

Commit e1a49142 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

USB: fix previous sparse fix which was incorrect 



The previous fix for a "sparse" warning in ehci_urb_dequeue() was
incorrect.  After rescheduling interrupt transfers it returned the
URB's completion status, not status for the dequeue operation itself.

This patch resolves that issue, cleans up the code in the reschedule
path, and shrinks the object code by a dozen bytes.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0cc5e2e7

drivers/usb/host/ehci-hcd.c

+12 −12
Original line number Diff line number Diff line
@@ -862,18 +862,18 @@ static int ehci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) 
		/* reschedule QH iff another request is queued */

		if (!list_empty (&qh->qtd_list)

				&& HC_IS_RUNNING (hcd->state)) {

			int schedule_status;

			rc = qh_schedule(ehci, qh);



			schedule_status = qh_schedule (ehci, qh);

			spin_unlock_irqrestore (&ehci->lock, flags);



			if (schedule_status != 0) {

				// shouldn't happen often, but ...

				// FIXME kill those tds' urbs

				err ("can't reschedule qh %p, err %d",

					qh, schedule_status);

			}

			return status;

			/* An error here likely indicates handshake failure

			 * or no space left in the schedule.  Neither fault

			 * should happen often ...

			 *

			 * FIXME kill the now-dysfunctional queued urbs

			 */

			if (rc != 0)

				ehci_err(ehci,

					"can't reschedule qh %p, err %d",

					qh, rc);

		}

		break;