---

yaml --- r: 109989 b: refs/heads/master c: 83a7982 h: refs/heads/master i: 109987: 25ada98 v: v3
git-mirror · Sep 23, 2008 · 48629ff · 48629ff
1 parent 44b1d61
commit 48629ff
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: f8834f1febb8f56cdcfeb35485e0cc7a8d547818
+refs/heads/master: 83a798207361cc26385187b2e71efa2b5d75de7f
diff --git 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);