summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorElric Fu <elricfu1@gmail.com>2012-03-29 15:47:50 +0800
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2012-04-11 08:28:59 -0700
commit457a4f61f9bfc3ae76e5b49f30f25d86bb696f67 (patch)
tree7212393e1707d108e9d9893121670aacb307e13f /drivers/usb
parentd8aec3dbdfd02627e198e7956ab4aaeba2a349fa (diff)
downloadlinux-3.10-457a4f61f9bfc3ae76e5b49f30f25d86bb696f67.tar.gz
linux-3.10-457a4f61f9bfc3ae76e5b49f30f25d86bb696f67.tar.bz2
linux-3.10-457a4f61f9bfc3ae76e5b49f30f25d86bb696f67.zip
xHCI: add XHCI_RESET_ON_RESUME quirk for VIA xHCI host
The suspend operation of VIA xHCI host have some issues and hibernate operation works fine, so The XHCI_RESET_ON_RESUME quirk is added for it. This patch should base on "xHCI: Don't write zeroed pointer to xHC registers" that is released by Sarah. Otherwise, the host system error will ocurr in the hibernate operation process. This should be backported to stable kernels as old as 2.6.37, that contain the commit c877b3b2ad5cb9d4fe523c5496185cc328ff3ae9 "xhci: Add reset on resume quirk for asrock p67 host". Signed-off-by: Elric Fu <elricfu1@gmail.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/xhci-pci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 0d7b8513596..7a856a767e7 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -95,6 +95,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
xhci->quirks |= XHCI_RESET_ON_RESUME;
xhci_dbg(xhci, "QUIRK: Resetting on resume\n");
}
+ if (pdev->vendor == PCI_VENDOR_ID_VIA)
+ xhci->quirks |= XHCI_RESET_ON_RESUME;
}
/* called during probe() after chip reset completes */