From 5a52a73092a5c5f4c3a3122c72a574327d52b45e Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Mon, 16 Mar 2009 14:21:56 -0400 Subject: [PATCH] --- yaml --- r: 132461 b: refs/heads/master c: 391016f6e2fe3b9979b4c6880a76e5e434d6947c h: refs/heads/master i: 132459: b9c85ca5fc622ca9d49194d048c9db02203029bc v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-q.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d45c989b49ec..f086fefa97c1 100644 --- 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 index 3712b925b315..ecc9b66c03cd 100644 --- 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 */