---

yaml --- r: 299431 b: refs/heads/master c: 2fbe2bf h: refs/heads/master i: 299429: 9732c9d 299427: 28c48bc 299423: c18a054 v: v3
git-mirror · Apr 18, 2012 · b5fb383 · b5fb383
1 parent 35311f0
commit b5fb383
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc75ce9d929aabeb0843a6b1a4ab320e58ba1597
+refs/heads/master: 2fbe2bf1fd37f9d99950bd8d8093623cf22cf08b
diff --git a/trunk/drivers/usb/host/ehci-hcd.c b/trunk/drivers/usb/host/ehci-hcd.c
@@ -858,8 +858,13 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
 		goto dead;
 	}
 
+	/*
+	 * We don't use STS_FLR, but some controllers don't like it to
+	 * remain on, so mask it out along with the other status bits.
+	 */
+	masked_status = status & (INTR_MASK | STS_FLR);
+
 	/* Shared IRQ? */
-	masked_status = status & INTR_MASK;
 	if (!masked_status || unlikely(ehci->rh_state == EHCI_RH_HALTED)) {
 		spin_unlock(&ehci->lock);
 		return IRQ_NONE;