From b5fb3831e622da9c316549e7d9eb1e48d4c8b309 Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Wed, 18 Apr 2012 11:33:00 -0400
Subject: [PATCH] --- yaml --- r: 299431 b: refs/heads/master c:
 2fbe2bf1fd37f9d99950bd8d8093623cf22cf08b h: refs/heads/master i:   299429:
 9732c9d4090c3f6e761465b9260a601754cbcebc   299427:
 28c48bca0a20052eacdad9baed7f693240c6f482   299423:
 c18a0543ed7e425646a8b471c7371cee29117ff1 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/host/ehci-hcd.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 95d2b6fd0067..a5b57c0ee1d3 100644
--- 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
index 95ca07a8e1b5..4a3bc5b7a06f 100644
--- 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;