Revert "USB: pxa2xx_udc: fix hardcoded irq number"
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 10 Mar 2007 22:22:07 +0000 (14:22 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 10 Mar 2007 22:22:07 +0000 (14:22 -0800)
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>
drivers/usb/gadget/pxa2xx_udc.c

index 571f3ebb70ab705fd95545853dda4a359c463ea4..f01890dc87515493393dcbf1ea05a8dd0dcd418f 100644 (file)
@@ -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;
                }
        }