aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorMatthew Garrett <mjg@redhat.com>2011-10-06 15:35:43 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-11 09:35:35 -0800
commitf72d6f85aa5857d889a2b4a41f2bd6be4918703a (patch)
tree40e744b4ac9d3083e5422076b0f8479416be8f93 /drivers/usb/host
parentab6e8fabfbdbca5a7273347e224fe59efe869e76 (diff)
downloadkernel_samsung_smdk4412-f72d6f85aa5857d889a2b4a41f2bd6be4918703a.zip
kernel_samsung_smdk4412-f72d6f85aa5857d889a2b4a41f2bd6be4918703a.tar.gz
kernel_samsung_smdk4412-f72d6f85aa5857d889a2b4a41f2bd6be4918703a.tar.bz2
USB: Fix runtime wakeup on OHCI
commit a8b43c00ef06aec49b9fe0a5bad8a6a320e4d27b upstream. At least some OHCI hardware (such as the MCP89) fails to flag any change in the host status register or the port status registers when receiving a remote wakeup while in D3 state. This results in the controller being resumed but no device state change being noticed, at which point the controller is put back to sleep again. Since there doesn't seem to be any reliable way to identify the state change, just unconditionally resume the hub. It'll be put back to sleep in the near future anyway if there are no active devices attached to it. Signed-off-by: Matthew Garrett <mjg@redhat.com> Cc: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/ohci-hub.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index 9154615..2f00040 100644
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -356,10 +356,7 @@ static void ohci_finish_controller_resume(struct usb_hcd *hcd)
msleep(20);
}
- /* Does the root hub have a port wakeup pending? */
- if (ohci_readl(ohci, &ohci->regs->intrstatus) &
- (OHCI_INTR_RD | OHCI_INTR_RHSC))
- usb_hcd_resume_root_hub(hcd);
+ usb_hcd_resume_root_hub(hcd);
}
/* Carry out polling-, autostop-, and autoresume-related state changes */