From 48629fffd43dc5edbc571f8972bdc52b03e13814 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoffrey.levand@am.sony.com>
Date: Fri, 22 Aug 2008 14:13:00 -0700
Subject: [PATCH] --- yaml --- r: 109989 b: refs/heads/master c:
 83a798207361cc26385187b2e71efa2b5d75de7f h: refs/heads/master i:   109987:
 25ada9805dfe5a3322784af2ff98272e9135d9e0 v: v3

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

diff --git a/[refs] b/[refs]
index bea7e684c970..5d591a8224d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8834f1febb8f56cdcfeb35485e0cc7a8d547818
+refs/heads/master: 83a798207361cc26385187b2e71efa2b5d75de7f
diff --git a/trunk/drivers/usb/core/hcd.c b/trunk/drivers/usb/core/hcd.c
index 8abd4e59bf4a..8ab389dca2b9 100644
--- a/trunk/drivers/usb/core/hcd.c
+++ b/trunk/drivers/usb/core/hcd.c
@@ -1876,7 +1876,8 @@ int usb_add_hcd(struct usb_hcd *hcd,
 		 * with IRQF_SHARED. As usb_hcd_irq() will always disable
 		 * interrupts we can remove it here.
 		 */
-		irqflags &= ~IRQF_DISABLED;
+		if (irqflags & IRQF_SHARED)
+			irqflags &= ~IRQF_DISABLED;
 
 		snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d",
 				hcd->driver->description, hcd->self.busnum);