USB: Update USB default wakeup settings

[pandora-kernel.git] / drivers / usb / core / hcd.c

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 73cbbd8..100d4b0 100644 (file)
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2429,7 +2429,7 @@ int usb_add_hcd(struct usb_hcd *hcd,
         * 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);
+       device_set_wakeup_capable(&rhdev->dev, 1);
 
        /* HCD_FLAG_RH_RUNNING doesn't matter until the root hub is
         * registered.  But since the controller can die at any time,
@@ -2478,6 +2478,13 @@ int usb_add_hcd(struct usb_hcd *hcd,
        }
        if (hcd->uses_new_polling && HCD_POLL_RH(hcd))
                usb_hcd_poll_rh_status(hcd);
+
+       /*
+        * Host controllers don't generate their own wakeup requests;
+        * they only forward requests from the root hub.  Therefore
+        * controllers should always be enabled for remote wakeup.
+        */
+       device_wakeup_enable(hcd->self.controller);
        return retval;
 
 error_create_attr_group: