diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-20 21:29:49 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-20 21:29:49 +0000 |
| commit | c51009aa07196b8ca6bac39ad47e93b8a5940210 (patch) | |
| tree | 8fb7ce51a33d3937f496aa3b5e667a51b27e3fcd /target/linux/adm5120-2.6/files/drivers | |
| parent | f4a4d900cafe7d675732d3a6e5dc48b5207d7553 (diff) | |
Disable PCMCIA for adm5120, request IRQ for the USB driver, fix duplicate lines in the GPIO code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7293 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120-2.6/files/drivers')
| -rw-r--r-- | target/linux/adm5120-2.6/files/drivers/usb/host/adm5120-hcd.c | 7 |
1 files changed, 6 insertions, 1 deletions
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 0f0a72a895..0164bbb915 100644 --- 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; |