Commit be521466 authored by Linus Torvalds's avatar Linus Torvalds

Revert "USB: pxa2xx_udc: fix hardcoded irq number"

This reverts commit d2487cb4.

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: default avatarRussell 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f47273e5
...@@ -2616,7 +2616,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev) ...@@ -2616,7 +2616,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
if (retval != 0) { if (retval != 0) {
printk(KERN_ERR "%s: can't get irq %i, err %d\n", printk(KERN_ERR "%s: can't get irq %i, err %d\n",
driver_name, vbus_irq, retval); driver_name, vbus_irq, retval);
free_irq(irq, dev); free_irq(IRQ_USB, dev);
return -EBUSY; return -EBUSY;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment