summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2016-10-21 16:49:07 -0400
committerBjorn Helgaas <bhelgaas@google.com>2016-11-11 16:32:35 -0600
commitccdb6be9ec6580ef69f68949ebe26e0fb58a6fb0 (patch)
tree2ffbfdb03906dd4a26e37fbd1063fdc7179ff97d /drivers/usb
parent6496ebd7edf446fccf8266a1a70ffcb64252593e (diff)
downloadlinux-stable-ccdb6be9ec6580ef69f68949ebe26e0fb58a6fb0.tar.gz
linux-stable-ccdb6be9ec6580ef69f68949ebe26e0fb58a6fb0.tar.bz2
linux-stable-ccdb6be9ec6580ef69f68949ebe26e0fb58a6fb0.zip
USB: UHCI: report non-PME wakeup signalling for Intel hardware
The UHCI controllers in Intel chipsets rely on a platform-specific non-PME mechanism for wakeup signalling. They can generate wakeup signals even though they don't support PME. We need to let the USB core know this so that it will enable runtime suspend for UHCI controllers. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> CC: stable@vger.kernel.org
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/uhci-pci.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/host/uhci-pci.c b/drivers/usb/host/uhci-pci.c
index 940304c33224..02260cfdedb1 100644
--- a/drivers/usb/host/uhci-pci.c
+++ b/drivers/usb/host/uhci-pci.c
@@ -129,6 +129,10 @@ static int uhci_pci_init(struct usb_hcd *hcd)
if (to_pci_dev(uhci_dev(uhci))->vendor == PCI_VENDOR_ID_HP)
uhci->wait_for_hp = 1;
+ /* Intel controllers use non-PME wakeup signalling */
+ if (to_pci_dev(uhci_dev(uhci))->vendor == PCI_VENDOR_ID_INTEL)
+ device_set_run_wake(uhci_dev(uhci), 1);
+
/* Set up pointers to PCI-specific functions */
uhci->reset_hc = uhci_pci_reset_hc;
uhci->check_and_reset_hc = uhci_pci_check_and_reset_hc;