diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-29 08:22:27 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-29 08:22:27 +0200 |
commit | 9cf6ffae380061b16b2b4269d4f2e1a50aa2508a (patch) | |
tree | ff03f182b1386e614fac1b3c58c3c5f1a2d51062 /drivers/usb/host/ehci-pci.c | |
parent | b3a5ce874c2619c9b8a6c5bbcfefdb95e0227600 (diff) | |
parent | 9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68 (diff) | |
download | linux-9cf6ffae380061b16b2b4269d4f2e1a50aa2508a.tar.gz linux-9cf6ffae380061b16b2b4269d4f2e1a50aa2508a.tar.bz2 linux-9cf6ffae380061b16b2b4269d4f2e1a50aa2508a.zip |
Merge 5.8-rc3 into usb-next
We want the USB fixes in here, and this resolves a merge issue found in
linux-next.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-pci.c')
-rw-r--r-- | drivers/usb/host/ehci-pci.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 3c3820ad9092..af3c1b9b38b2 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -216,6 +216,13 @@ static int ehci_pci_setup(struct usb_hcd *hcd) ehci_info(ehci, "applying MosChip frame-index workaround\n"); ehci->frame_index_bug = 1; break; + case PCI_VENDOR_ID_HUAWEI: + /* Synopsys HC bug */ + if (pdev->device == 0xa239) { + ehci_info(ehci, "applying Synopsys HC workaround\n"); + ehci->has_synopsys_hc_bug = 1; + } + break; } /* optional debug port, normally in the first BAR */ |