---

yaml
---
r: 86063
b: refs/heads/master
c: e1a4914
h: refs/heads/master
i:
  86061: 7c3cf39
  86059: a1fb657
  86055: 611038c
  86047: c03c4d5
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cc5e2e7c3edd8b45775f50c74738d61b43ac5e8
+refs/heads/master: e1a491429e7f9b6fb608d9f173e5807fba053d5b

trunk/drivers/usb/host/ehci-hcd.c

@@ -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;
-
-			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;
+			rc = qh_schedule(ehci, qh);
+
+			/* 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;