From 3ee6dd55fd71c03bd000f41957386bc8abb1c037 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 17 Feb 2011 14:39:36 -0800
Subject: [PATCH] --- yaml --- r: 233571 b: refs/heads/master c:
 9ce4f80fb67b47b96c647ac6280a06dbd4bb50d2 h: refs/heads/master i:   233569:
 587906505362f72dc78601fd96d5c74c9e64d078   233567:
 498797e025fe002ece4a6385769f9619aa07334c v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/usb/core/hub.c | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 3d639785d20e..a92b34c880b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd305ad4c5d6bfacf7cb087aaaf6dd3f8a18b292
+refs/heads/master: 9ce4f80fb67b47b96c647ac6280a06dbd4bb50d2
diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c
index 0f299b7aad60..d041c6826e43 100644
--- a/trunk/drivers/usb/core/hub.c
+++ b/trunk/drivers/usb/core/hub.c
@@ -2681,13 +2681,17 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
 
 	mutex_lock(&usb_address0_mutex);
 
-	/* Reset the device; full speed may morph to high speed */
-	/* FIXME a USB 2.0 device may morph into SuperSpeed on reset. */
-	retval = hub_port_reset(hub, port1, udev, delay);
-	if (retval < 0)		/* error or disconnect */
-		goto fail;
-	/* success, speed is known */
-
+	if (!udev->config && oldspeed == USB_SPEED_SUPER) {
+		/* Don't reset USB 3.0 devices during an initial setup */
+		usb_set_device_state(udev, USB_STATE_DEFAULT);
+	} else {
+		/* Reset the device; full speed may morph to high speed */
+		/* FIXME a USB 2.0 device may morph into SuperSpeed on reset. */
+		retval = hub_port_reset(hub, port1, udev, delay);
+		if (retval < 0)		/* error or disconnect */
+			goto fail;
+		/* success, speed is known */
+	}
 	retval = -ENODEV;
 
 	if (oldspeed != USB_SPEED_UNKNOWN && oldspeed != udev->speed) {