Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / usb / host / ohci-ppc-of.c

diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c
index 0a74269201502e4381ecc609b6f039568d99b537..a6725279122315bf7566b255164d29c7f8130bbd 100644 (file)
--- a/drivers/usb/host/ohci-ppc-of.c
+++ b/drivers/usb/host/ohci-ppc-of.c
@@ -136,13 +136,15 @@ ohci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match)
        ohci = hcd_to_ohci(hcd);
        if (is_bigendian) {
                ohci->flags |= OHCI_QUIRK_BE_MMIO | OHCI_QUIRK_BE_DESC;
+               if (of_device_is_compatible(dn, "fsl,mpc5200-ohci"))
+                       ohci->flags |= OHCI_QUIRK_FRAME_NO;
                if (of_device_is_compatible(dn, "mpc5200-ohci"))
                        ohci->flags |= OHCI_QUIRK_FRAME_NO;
        }
 
        ohci_hcd_init(ohci);
 
-       rv = usb_add_hcd(hcd, irq, 0);
+       rv = usb_add_hcd(hcd, irq, IRQF_DISABLED);
        if (rv == 0)
                return 0;