diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-21 12:21:08 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 12:21:08 +0100 |
| commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
| tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /drivers/usb/host/ohci-ssb.c | |
| parent | [POWERPC] Make non-PCI build work again (diff) | |
| parent | Linux 2.6.24-rc6 (diff) | |
| download | linux-c2a7dcad9f0d92d7a96e735abb8bec7b9c621536.tar.xz linux-c2a7dcad9f0d92d7a96e735abb8bec7b9c621536.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/usb/host/ohci-ssb.c')
| -rw-r--r-- | drivers/usb/host/ohci-ssb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c index fe70e72340de..6e9c2d6db887 100644 --- a/drivers/usb/host/ohci-ssb.c +++ b/drivers/usb/host/ohci-ssb.c @@ -160,7 +160,7 @@ static int ssb_ohci_attach(struct ssb_device *dev) hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len); if (!hcd->regs) goto err_put_hcd; - err = usb_add_hcd(hcd, dev->irq, IRQF_SHARED); + err = usb_add_hcd(hcd, dev->irq, IRQF_DISABLED | IRQF_SHARED); if (err) goto err_iounmap; |