KARO: cleanup after merge of Freescale 3.10.17 stuff

[karo-tx-linux.git] / drivers / usb / core / hub.c

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 69d3afbe8ed5e09dad5e559be8608de0597f3d11..0e950ad8cb2525fd0b335a20b46d2fc28f814f9f 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -4553,7 +4553,8 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
 
        /* Disconnect any existing devices under this port */
        if (udev) {
-               if (hcd->phy && !hdev->parent)
+               if (hcd->phy && !hdev->parent &&
+                               !(portstatus & USB_PORT_STAT_CONNECTION))
                        usb_phy_notify_disconnect(hcd->phy, udev->speed);
                usb_disconnect(&port_dev->child);
        }