From 43aaa29fb34314f9c04649ecba0a6624c96f4471 Mon Sep 17 00:00:00 2001
From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Date: Wed, 14 Nov 2012 15:58:52 -0800
Subject: [PATCH] --- yaml --- r: 348679 b: refs/heads/master c:
 1c7439c61fa6516419c32a9824976334ea969d47 h: refs/heads/master i:   348677:
 c81160391ed357ec8b917f6279409ceed76dc765   348675:
 9d314a628aeb814f053de7deb7a1c3a812111df4   348671:
 a6f2f23d263ae6669df2b65f98baf56d13bce4ba v: v3

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

diff --git a/[refs] b/[refs]
index 7edf0da8b203..11db232b5e47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55c1945edaac94c5338a3647bc2e85ff75d9cf36
+refs/heads/master: 1c7439c61fa6516419c32a9824976334ea969d47
diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c
index a815fd2cc5e7..7f8f10ec127e 100644
--- a/trunk/drivers/usb/core/hub.c
+++ b/trunk/drivers/usb/core/hub.c
@@ -2580,16 +2580,16 @@ static void hub_port_finish_reset(struct usb_hub *hub, int port1,
 		clear_port_feature(hub->hdev,
 				port1, USB_PORT_FEAT_C_RESET);
 		/* FIXME need disconnect() for NOTATTACHED device */
-		if (warm) {
+		if (hub_is_superspeed(hub->hdev)) {
 			clear_port_feature(hub->hdev, port1,
 					USB_PORT_FEAT_C_BH_PORT_RESET);
 			clear_port_feature(hub->hdev, port1,
 					USB_PORT_FEAT_C_PORT_LINK_STATE);
-		} else {
+		}
+		if (!warm)
 			usb_set_device_state(udev, *status
 					? USB_STATE_NOTATTACHED
 					: USB_STATE_DEFAULT);
-		}
 		break;
 	}
 }