X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fusb%2Fcore%2Fhub.c;h=bd9dc3504b5149b2ff5091d67bb514a92cbc0a88;hb=2cde51fbd0f310c8a2c5f977e665c0ac3945b46d;hp=a7c04e24ca484deb233db5dcfd995b73427c4cc0;hpb=c537aba00e3f1df8ce6c7c9fcb98b82c0c2d1d2c;p=~andy%2Flinux

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index a7c04e24ca4..bd9dc3504b5 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -4832,8 +4832,9 @@ static void hub_events(void)
 					hub->ports[i - 1]->child;
 
 				dev_dbg(hub_dev, "warm reset port %d\n", i);
-				if (!udev || !(portstatus &
-						USB_PORT_STAT_CONNECTION)) {
+				if (!udev ||
+				    !(portstatus & USB_PORT_STAT_CONNECTION) ||
+				    udev->state == USB_STATE_NOTATTACHED) {
 					status = hub_port_reset(hub, i,
 							NULL, HUB_BH_RESET_TIME,
 							true);