aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/xhci-pci.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-27 12:42:15 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-27 12:42:15 +0200
commit908e757daecf2120c3019fa630ae5d4c3cd7165b (patch)
tree652b0f3ecd4a6d7c0066169d6ae466711300197c /drivers/usb/host/xhci-pci.c
parentstaging: comedi: addi: Replace HTTP links with HTTPS ones (diff)
parentLinux 5.8-rc7 (diff)
downloadlinux-dev-908e757daecf2120c3019fa630ae5d4c3cd7165b.tar.xz
linux-dev-908e757daecf2120c3019fa630ae5d4c3cd7165b.zip
Merge 5.8-rc7 into staging-next
We need the staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/xhci-pci.c')
-rw-r--r--drivers/usb/host/xhci-pci.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index ef513c2fb843..9234c82e70e4 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -265,6 +265,9 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
pdev->device == 0x1142)
xhci->quirks |= XHCI_TRUST_TX_LENGTH;
+ if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
+ pdev->device == 0x2142)
+ xhci->quirks |= XHCI_NO_64BIT_SUPPORT;
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI)