From ee3c324bcce1c20f11f5a861c3e005a62447f4d8 Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Thu, 26 Apr 2012 11:31:57 -0400
Subject: [PATCH] --- yaml --- r: 299833 b: refs/heads/master c:
 320cd1e750f1bf3e47eb41209dcb2be07264cb76 h: refs/heads/master i:   299831:
 fcb29555bb24d95bf645f9a86a96d24afbb014e7 v: v3

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

diff --git a/[refs] b/[refs]
index 0077eff68983..e6d82ace8c13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83a787a71e034244a9fd1d5988fe18f226341417
+refs/heads/master: 320cd1e750f1bf3e47eb41209dcb2be07264cb76
diff --git a/trunk/drivers/usb/gadget/udc-core.c b/trunk/drivers/usb/gadget/udc-core.c
index df1bd87232dd..e5e44f8cde9a 100644
--- a/trunk/drivers/usb/gadget/udc-core.c
+++ b/trunk/drivers/usb/gadget/udc-core.c
@@ -263,8 +263,8 @@ static void usb_gadget_remove_driver(struct usb_udc *udc)
 
 	if (udc_is_newstyle(udc)) {
 		udc->driver->disconnect(udc->gadget);
-		udc->driver->unbind(udc->gadget);
 		usb_gadget_disconnect(udc->gadget);
+		udc->driver->unbind(udc->gadget);
 		usb_gadget_udc_stop(udc->gadget, udc->driver);
 	} else {
 		usb_gadget_stop(udc->gadget, udc->driver);