diff options
| author | Florian Fainelli <florian@openwrt.org> | 2007-05-20 21:29:49 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2007-05-20 21:29:49 +0000 |
| commit | 52766d28516d73862c3430b5fb7ec8a44ea0e090 (patch) | |
| tree | 4c93f7c0255f963bff28b69ea95aeac0c7ff7f05 /target/linux/adm5120-2.6/files/drivers/usb/host | |
| parent | 6a10911e6edc472a8bccdb8b445324d1e386d190 (diff) | |
| download | master-31e0f0ae-52766d28516d73862c3430b5fb7ec8a44ea0e090.tar.gz master-31e0f0ae-52766d28516d73862c3430b5fb7ec8a44ea0e090.tar.bz2 master-31e0f0ae-52766d28516d73862c3430b5fb7ec8a44ea0e090.zip | |
Disable PCMCIA for adm5120, request IRQ for the USB driver, fix duplicate lines in the GPIO code
SVN-Revision: 7293
Diffstat (limited to 'target/linux/adm5120-2.6/files/drivers/usb/host')
| -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; |