Merge git://git.infradead.org/users/willy/linux-nvme

[~andy/linux] / drivers / usb / host / ohci-ssb.c

diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c
index c4aea3b8315e668eae752e7d8f1ac9ce6250c8f3..5ba18595d6f78bb4e104406fe18ec8c9df634805 100644 (file)
--- a/drivers/usb/host/ohci-ssb.c
+++ b/drivers/usb/host/ohci-ssb.c
@@ -169,7 +169,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_DISABLED | IRQF_SHARED);
+       err = usb_add_hcd(hcd, dev->irq, IRQF_SHARED);
        if (err)
                goto err_iounmap;