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]>

diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 571f3ebb70ab705fd95545853dda4a359c463ea4..f01890dc87515493393dcbf1ea05a8dd0dcd418f 100644 (file)
--- 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;
                }
        }