Commit:     be521466feb3bb1cd89de82a2b1d080e9ebd3cb6
Parent:     f47273e5c8f679220091335e0bed79e46237cfda
Author:     Linus Torvalds <[EMAIL PROTECTED]>
AuthorDate: Sat Mar 10 14:22:07 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sat Mar 10 14:22:07 2007 -0800

    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: David Brownell <[EMAIL PROTECTED]>,
    Cc: Milan Svoboda <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 drivers/usb/gadget/pxa2xx_udc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 571f3eb..f01890d 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;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to