1 files changed, 20 insertions, 13 deletions

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 879b66e13370..21b99b4b4082 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1526,18 +1526,6 @@ static int hub_configure(struct usb_hub *hub,
                 dev_dbg(hub_dev, "%umA bus power budget for each child\n",
                                 hub->mA_per_port);
 
-        /* Update the HCD's internal representation of this hub before khubd
-         * starts getting port status changes for devices under the hub.
-         */
-        if (hcd->driver->update_hub_device) {
-                ret = hcd->driver->update_hub_device(hcd, hdev,
-                                &hub->tt, GFP_KERNEL);
-                if (ret < 0) {
-                        message = "can't update HCD hub info";
-                        goto fail;
-                }
-        }
-
         ret = hub_hub_status(hub, &hubstatus, &hubchange);
         if (ret < 0) {
                 message = "can't get hub status";
@@ -1589,10 +1577,28 @@ static int hub_configure(struct usb_hub *hub,
                 }
         }
         hdev->maxchild = i;
+        for (i = 0; i < hdev->maxchild; i++) {
+                struct usb_port *port_dev = hub->ports[i];
+
+                pm_runtime_put(&port_dev->dev);
+        }
+
         mutex_unlock(&usb_port_peer_mutex);
         if (ret < 0)
                 goto fail;
 
+        /* Update the HCD's internal representation of this hub before khubd
+         * starts getting port status changes for devices under the hub.
+         */
+        if (hcd->driver->update_hub_device) {
+                ret = hcd->driver->update_hub_device(hcd, hdev,
+                                &hub->tt, GFP_KERNEL);
+                if (ret < 0) {
+                        message = "can't update HCD hub info";
+                        goto fail;
+                }
+        }
+
         usb_hub_adjust_deviceremovable(hdev, hub->descriptor);
 
         hub_activate(hub, HUB_INIT);
@@ -3458,7 +3464,8 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
                 struct usb_device *udev = port_dev->child;
 
                 if (udev && udev->can_submit) {
-                        dev_warn(&port_dev->dev, "not suspended yet\n");
+                        dev_warn(&port_dev->dev, "device %s not suspended yet\n",
+                                        dev_name(&udev->dev));
                         if (PMSG_IS_AUTO(msg))
                                 return -EBUSY;
                 }