From d3e79dc26a0068215e12d019f023d3cc9b4a0a18 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Mon, 3 Oct 2011 16:39:30 +0300
Subject: [PATCH] --- yaml --- r: 275794 b: refs/heads/master c:
 6f39504de55ef69bb8d9d0a645949c5d0407faab h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f5a8283f1897..bab4e8139d10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c2d636a1c6f1f84adf77737ca716f956595ae80
+refs/heads/master: 6f39504de55ef69bb8d9d0a645949c5d0407faab
diff --git a/trunk/drivers/usb/gadget/udc-core.c b/trunk/drivers/usb/gadget/udc-core.c
index 31e410bbe55a..4c5ff14a7c61 100644
--- a/trunk/drivers/usb/gadget/udc-core.c
+++ b/trunk/drivers/usb/gadget/udc-core.c
@@ -210,10 +210,10 @@ static void usb_gadget_remove_driver(struct usb_udc *udc)
 	kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
 
 	if (udc_is_newstyle(udc)) {
-		usb_gadget_disconnect(udc->gadget);
+		udc->driver->disconnect(udc->gadget);
 		udc->driver->unbind(udc->gadget);
 		usb_gadget_udc_stop(udc->gadget, udc->driver);
-
+		usb_gadget_disconnect(udc->gadget);
 	} else {
 		usb_gadget_stop(udc->gadget, udc->driver);
 	}