From ffa00c07915a34c364fb5b92b3bdafff979b16fd Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 16 Jun 2011 20:36:56 +0200
Subject: [PATCH] --- yaml --- r: 259239 b: refs/heads/master c:
 99fd14080e7f0a65b87830bf5062b09f6e80dd13 h: refs/heads/master i:   259237:
 a685f6593e97c78508b6c0a6ba784150ca12e095   259235:
 a3a3cc9e4dfac3521139750171588612acdf4661   259231:
 52e1d28a0c5c3681b07e1409b6a2a7cd19b44453 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/usb/gadget/dummy_hcd.c | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 92062e2703d0..c8cc44bc0d5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2542787430fc46b4e07e0da4c6ec80ed230032e5
+refs/heads/master: 99fd14080e7f0a65b87830bf5062b09f6e80dd13
diff --git a/trunk/drivers/usb/gadget/dummy_hcd.c b/trunk/drivers/usb/gadget/dummy_hcd.c
index cecc25ad4586..834fb923a062 100644
--- a/trunk/drivers/usb/gadget/dummy_hcd.c
+++ b/trunk/drivers/usb/gadget/dummy_hcd.c
@@ -929,6 +929,14 @@ static int dummy_udc_start(struct usb_gadget_driver *driver,
 		dum->ep[0].ep.maxpacket = 9;
 	} else
 		dum->ep[0].ep.maxpacket = 64;
+
+	if (dum->gadget.speed == USB_SPEED_SUPER)
+		dum->gadget.is_otg =
+			(dummy_hcd_to_hcd(dum->ss_hcd)->self.otg_port != 0);
+	else
+		dum->gadget.is_otg =
+			(dummy_hcd_to_hcd(dum->hs_hcd)->self.otg_port != 0);
+
 	list_del_init (&dum->ep [0].ep.ep_list);
 	INIT_LIST_HEAD(&dum->fifo_req.queue);
 
@@ -944,13 +952,6 @@ static int dummy_udc_start(struct usb_gadget_driver *driver,
 		return retval;
 	}
 
-	if (dum->gadget.speed == USB_SPEED_SUPER)
-		dum->gadget.is_otg =
-			(dummy_hcd_to_hcd(dum->ss_hcd)->self.otg_port != 0);
-	else
-		dum->gadget.is_otg =
-			(dummy_hcd_to_hcd(dum->hs_hcd)->self.otg_port != 0);
-
 	/* khubd will enumerate this in a while */
 	dummy_pullup(&dum->gadget, 1);
 	return 0;