diff options
| author | Simon Horman <horms@verge.net.au> | 2008-10-07 08:40:11 +1100 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-10-07 08:40:11 +1100 |
| commit | a5e8546a8bff5d2047adc279df5753c44ba7b1a1 (patch) | |
| tree | d9ca91f74d8279adbb1d3e942cc7ab145780ee29 /drivers/usb/core/hcd.c | |
| parent | cb7f6a7b716e801097b564dec3ccb58d330aef56 (diff) | |
| parent | c7004482e8dcb7c3c72666395cfa98a216a4fb70 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6
Diffstat (limited to 'drivers/usb/core/hcd.c')
| -rw-r--r-- | drivers/usb/core/hcd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 8abd4e59bf4..8ab389dca2b 100644 --- a/drivers/usb/core/hcd.c +++ b/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); |