From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 10 Mar 2007 22:22:07 +0000 (-0800)
Subject: Revert "USB: pxa2xx_udc: fix hardcoded irq number"
X-Git-Tag: v3.12-rc1~31091
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be521466feb3bb1cd89de82a2b1d080e9ebd3cb6;p=kernel%2Fkernel-generic.git

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

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;
 		}
 	}