Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / usb / gadget / atmel_usba_udc.c

diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 717ff653fa2330a9e5b78774b1a084f80186faf0..e7c65a4408fb6aa8f3344c198824a50ce8692fae 100644 (file)
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -2057,8 +2057,10 @@ static int __exit usba_udc_remove(struct platform_device *pdev)
                usba_ep_cleanup_debugfs(&usba_ep[i]);
        usba_cleanup_debugfs(udc);
 
-       if (gpio_is_valid(udc->vbus_pin))
+       if (gpio_is_valid(udc->vbus_pin)) {
+               free_irq(gpio_to_irq(udc->vbus_pin), udc);
                gpio_free(udc->vbus_pin);
+       }
 
        free_irq(udc->irq, udc);
        kfree(usba_ep);