---

yaml --- r: 132461 b: refs/heads/master c: 391016f h: refs/heads/master i: 132459: b9c85ca v: v3
git-mirror · Mar 17, 2009 · 5a52a73 · 5a52a73
1 parent 5ceb093
commit 5a52a73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 508db8c954d55ed30f870d2c24d741ba6269d13c
+refs/heads/master: 391016f6e2fe3b9979b4c6880a76e5e434d6947c
diff --git a/trunk/drivers/usb/host/ehci-q.c b/trunk/drivers/usb/host/ehci-q.c
@@ -1095,7 +1095,8 @@ static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
 	prev->qh_next = qh->qh_next;
 	wmb ();
 
-	if (unlikely (ehci_to_hcd(ehci)->state == HC_STATE_HALT)) {
+	/* If the controller isn't running, we don't have to wait for it */
+	if (unlikely(!HC_IS_RUNNING(ehci_to_hcd(ehci)->state))) {
 		/* if (unlikely (qh->reclaim != 0))
 		 *	this will recurse, probably not much
 		 */