Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 65a9609f4ad6..5cf5f1eca4f4 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -593,12 +593,10 @@ static int ohci_run (struct ohci_hcd *ohci)
          * to be checked in case boot firmware (BIOS/SMM/...) has set up
          * wakeup in a way the bus isn't aware of (e.g., legacy PCI PM).
          * If the bus glue detected wakeup capability then it should
-         * already be enabled.  Either way, if wakeup should be enabled
-         * but isn't, we'll enable it now.
+         * already be enabled; if so we'll just enable it again.
          */
-        if ((ohci->hc_control & OHCI_CTRL_RWC) != 0
-                        && !device_can_wakeup(hcd->self.controller))
-                device_init_wakeup(hcd->self.controller, 1);
+        if ((ohci->hc_control & OHCI_CTRL_RWC) != 0)
+                device_set_wakeup_capable(hcd->self.controller, 1);
 
         switch (ohci->hc_control & OHCI_CTRL_HCFS) {
         case OHCI_USB_OPER: