aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-10 17:22:07 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-10 17:22:07 -0500
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 <rmk@arm.linux.org.uk> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Greg KH <greg@kroah.com> Cc: David Brownell <david-b@pacbell.net>, Cc: Milan Svoboda <msvoboda@ra.rockwell.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-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:
2616 if (retval != 0) { 2616 if (retval != 0) {
2617 printk(KERN_ERR "%s: can't get irq %i, err %d\n", 2617 printk(KERN_ERR "%s: can't get irq %i, err %d\n",
2618 driver_name, vbus_irq, retval); 2618 driver_name, vbus_irq, retval);
2619 free_irq(irq, dev); 2619 free_irq(IRQ_USB, dev);
2620 return -EBUSY; 2620 return -EBUSY;
2621 } 2621 }
2622 } 2622 }