Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

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

diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index 6aca2c4453f7aed7884e5b1e6520f6fffbeac753..843509778a33ea4de570ab052dafedd8e83687e3 100644 (file)
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -344,7 +344,7 @@ static int usb_hcd_da8xx_probe(const struct hc_driver *driver,
                error = -ENODEV;
                goto err4;
        }
-       error = usb_add_hcd(hcd, irq, IRQF_DISABLED);
+       error = usb_add_hcd(hcd, irq, 0);
        if (error)
                goto err4;