xhci-mem.c: xhci_segment_free: No need for checking seg argument

[pandora-kernel.git] / drivers / usb / host / ohci-omap3.c

diff --git a/drivers/usb/host/ohci-omap3.c b/drivers/usb/host/ohci-omap3.c
index 6048f2f..516ebc4 100644 (file)
--- a/drivers/usb/host/ohci-omap3.c
+++ b/drivers/usb/host/ohci-omap3.c
@@ -149,7 +149,7 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)
 
        res = platform_get_resource_byname(pdev,
                                IORESOURCE_MEM, "ohci");
-       if (!ret) {
+       if (!res) {
                dev_err(dev, "UHH OHCI get resource failed\n");
                return -ENOMEM;
        }
@@ -180,7 +180,7 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)
 
        ohci_hcd_init(hcd_to_ohci(hcd));
 
-       ret = usb_add_hcd(hcd, irq, IRQF_DISABLED);
+       ret = usb_add_hcd(hcd, irq, 0);
        if (ret) {
                dev_dbg(dev, "failed to add hcd with err %d\n", ret);
                goto err_add_hcd;