From d90c959e1b91cf79bf8ef181fc8506fb2d604932 Mon Sep 17 00:00:00 2001
From: Rob Emanuele <rje@crystalfontz.com>
Date: Tue, 14 Dec 2010 19:00:30 +0100
Subject: [PATCH] --- yaml --- r: 227039 b: refs/heads/master c:
 2c8245c4990e75d86ab30bb0af9bb90cbe04985d h: refs/heads/master i:   227037:
 53a84fe7d5a517dda18750f0362f79849a27085e   227035:
 fd2745c6e3dc2aa5e8d130d78122694602dcb3fd   227031:
 2d695a65f99defd120bcc6f04ff42d2d39fb3dd6   227023:
 d75203538646dfb8f72491529290dbfe43c0e5bd   227007:
 45198f3528ec14f14811b1152d16539319e8a404 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/usb/gadget/atmel_usba_udc.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ef5dc049ed8e..7cc166bfafc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ef9fc657bd69c708ada2ee9fd3b2e13f7600a3d
+refs/heads/master: 2c8245c4990e75d86ab30bb0af9bb90cbe04985d
diff --git a/trunk/drivers/usb/gadget/atmel_usba_udc.c b/trunk/drivers/usb/gadget/atmel_usba_udc.c
index 717ff653fa23..e7c65a4408fb 100644
--- a/trunk/drivers/usb/gadget/atmel_usba_udc.c
+++ b/trunk/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);