diff options
| author | Oliver Neukum | 2014-10-27 14:53:29 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-11-04 00:48:45 +0100 |
| commit | b45abacde3d551c6696c6738bef4a1805d0bf27a (patch) | |
| tree | b6587d1bd7b9b7b57089691af4bac221bdde0f34 /drivers/usb/host | |
| parent | USB: quirks: enable device-qualifier quirk for yet another Elan touchscreen (diff) | |
| download | kernel-qcow2-linux-b45abacde3d551c6696c6738bef4a1805d0bf27a.tar.gz kernel-qcow2-linux-b45abacde3d551c6696c6738bef4a1805d0bf27a.tar.xz kernel-qcow2-linux-b45abacde3d551c6696c6738bef4a1805d0bf27a.zip | |
xhci: no switching back on non-ULT Haswell
The switch back is limited to ULT even on HP. The contrary
finding arose by bad luck in BIOS versions for testing.
This fixes spontaneous resume from S3 on some HP laptops.
Signed-off-by: Oliver Neukum <oneukum@suse.de>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/xhci-pci.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 2c7f3fb811d1..9a69b1f1b300 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -128,20 +128,6 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |= XHCI_AVOID_BEI; } if (pdev->vendor == PCI_VENDOR_ID_INTEL && - (pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI || - pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI)) { - /* Workaround for occasional spurious wakeups from S5 (or - * any other sleep) on Haswell machines with LPT and LPT-LP - * with the new Intel BIOS - */ - /* Limit the quirk to only known vendors, as this triggers - * yet another BIOS bug on some other machines - * https://bugzilla.kernel.org/show_bug.cgi?id=66171 - */ - if (pdev->subsystem_vendor == PCI_VENDOR_ID_HP) - xhci->quirks |= XHCI_SPURIOUS_WAKEUP; - } - if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI) { xhci->quirks |= XHCI_SPURIOUS_REBOOT; } |