1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index fbd938d4ea5..e2e00ba4e1e 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1805,6 +1805,12 @@ int usb_add_hcd(struct usb_hcd *hcd,
                         USB_SPEED_FULL;
         hcd->self.root_hub = rhdev;
 
+        /* wakeup flag init defaults to "everything works" for root hubs,
+         * but drivers can override it in reset() if needed, along with
+         * recording the overall controller's system wakeup capability.
+         */
+        device_init_wakeup(&rhdev->dev, 1);
+
         /* "reset" is misnamed; its role is now one-time init. the controller
          * should already have been reset (and boot firmware kicked off etc).
          */
@@ -1813,13 +1819,6 @@ int usb_add_hcd(struct usb_hcd *hcd,
                 goto err_hcd_driver_setup;
         }
 
-        /* wakeup flag init is in transition; for now we can't rely on PCI to
-         * initialize these bits properly, so we let reset() override it.
-         * This init should _precede_ the reset() once PCI behaves.
-         */
-        device_init_wakeup(&rhdev->dev,
-                        device_can_wakeup(hcd->self.controller));
-
         /* NOTE: root hub and controller capabilities may not be the same */
         if (device_can_wakeup(hcd->self.controller)
                         && device_can_wakeup(&hcd->self.root_hub->dev))