aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2007-03-10 14:22:07 -0800
committerLinus Torvalds <[email protected]>2007-03-10 14:22:07 -0800
commitbe521466feb3bb1cd89de82a2b1d080e9ebd3cb6 (patch)
treeeedad20f581646f929507b8e84cca819f6442712
parentf47273e5c8f679220091335e0bed79e46237cfda (diff)
Revert "USB: pxa2xx_udc: fix hardcoded irq number"
This reverts commit d2487cb4257dafb686f682285854fe7f02ca29d8. Russell King points out that it's obviously bogus, and I have to agree. Not only does "irq" not even exist in that scope, but we obviously need to free the irq that we actually requested, and that's IRQ_USB. Reported-by: Russell King <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Greg KH <[email protected]> Cc: David Brownell <[email protected]>, Cc: Milan Svoboda <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
-rw-r--r--drivers/usb/gadget/pxa2xx_udc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 571f3ebb70ab..f01890dc8751 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -2616,7 +2616,7 @@ lubbock_fail0:
if (retval != 0) {
printk(KERN_ERR "%s: can't get irq %i, err %d\n",
driver_name, vbus_irq, retval);
- free_irq(irq, dev);
+ free_irq(IRQ_USB, dev);
return -EBUSY;
}
}