From 924efc873ddadfa72902a11bea8f0198880c65a4 Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Mon, 2 Jul 2012 13:36:23 -0700 Subject: [PATCH] --- yaml --- r: 321707 b: refs/heads/master c: 5cb7df2b2d3afee7638b3ef23a5bcb89c6f07bd9 h: refs/heads/master i: 321705: a60582fa7f18574c6f2efd4a27d982302cf697c9 321703: 7148f606e2b92e405fb97c3d9fd0ee7a2ad5da41 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/xhci-pci.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fdd36141ad01..d9f93a4412a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22ceac191211cf6688b1bf6ecd93c8b6bf80ed9b +refs/heads/master: 5cb7df2b2d3afee7638b3ef23a5bcb89c6f07bd9 diff --git a/trunk/drivers/usb/host/xhci-pci.c b/trunk/drivers/usb/host/xhci-pci.c index 18b231b0c5d3..92eaff6097c0 100644 --- a/trunk/drivers/usb/host/xhci-pci.c +++ b/trunk/drivers/usb/host/xhci-pci.c @@ -99,6 +99,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) pdev->device == PCI_DEVICE_ID_ASROCK_P67) { xhci->quirks |= XHCI_RESET_ON_RESUME; xhci_dbg(xhci, "QUIRK: Resetting on resume\n"); + xhci->quirks |= XHCI_TRUST_TX_LENGTH; } if (pdev->vendor == PCI_VENDOR_ID_VIA) xhci->quirks |= XHCI_RESET_ON_RESUME;