From: Denis Turischev Date: Tue, 20 May 2014 11:00:42 +0000 (+0300) Subject: xhci: Switch only Intel Lynx Point-LP ports to EHCI on shutdown. X-Git-Tag: v3.12.23~106 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d0f30eb91a4beef22aa86c89a21d2492832f33c9;p=platform%2Fkernel%2Flinux-stable.git xhci: Switch only Intel Lynx Point-LP ports to EHCI on shutdown. commit 0a939993bff117d3657108ca13b011fc0378aedb upstream. Patch "xhci: Switch Intel Lynx Point ports to EHCI on shutdown." commit c09ec25d3684cad74d851c0f028a495999591279 is not fully correct It switches both Lynx Point and Lynx Point-LP ports to EHCI on shutdown. On some Lynx Point machines it causes spurious interrupt, which wake the system: bugzilla.kernel.org/show_bug.cgi?id=76291 On Lynx Point-LP on the contrary switching ports to EHCI seems to be necessary to fix these spurious interrupts. Signed-off-by: Denis Turischev Reported-by: Wulf Richartz Cc: Mathias Nyman Signed-off-by: Greg Kroah-Hartman Signed-off-by: Jiri Slaby --- diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 17447ef59d08..f34b42e4c391 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -134,7 +134,9 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) */ 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; } if (pdev->vendor == PCI_VENDOR_ID_ETRON &&