Disable PCMCIA for adm5120, request IRQ for the USB driver, fix duplicate lines in...

[lede-git/.git] / target / linux / adm5120-2.6 / files / drivers / usb / host / adm5120-hcd.c

diff --git a/target/linux/adm5120-2.6/files/drivers/usb/host/adm5120-hcd.c b/target/linux/adm5120-2.6/files/drivers/usb/host/adm5120-hcd.c
index 0f0a72a8959e5c499d520b8b31a5f0fa1a060c82..0164bbb915ada490ec43f122ebc99bda900d5b83 100644 (file)
--- a/target/linux/adm5120-2.6/files/drivers/usb/host/adm5120-hcd.c
+++ b/target/linux/adm5120-2.6/files/drivers/usb/host/adm5120-hcd.c
@@ -716,7 +716,12 @@ static int __init adm5120hcd_probe(struct platform_device *pdev)
 
        data = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        addr = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-       irq = platform_get_irq(pdev, 0);
+
+       if (request_irq(data.start, adm5120hcd_irq, 0, hcd_name, hcd)) {
+               printk(KERN_WARNING "Could not request IRQ\n");
+               err = -EBUSY;
+               goto out;
+       }
 
        if (!addr || !data || irq < 0) {
                err = -ENODEV;