diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-08 15:32:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-08 15:32:10 -0800 |
| commit | 70be9ac2b64c0d0db4f0e3004b764df33b1098e2 (patch) | |
| tree | 92f616d734f2acf9edff6ef0f8ecd93144498325 | |
| parent | e2dac603d4bcb98c65d6f97848b72a217d0dd854 (diff) | |
| parent | f57a98e1b71357713e44c57268a53d9c803f0626 (diff) | |
| download | lwn-70be9ac2b64c0d0db4f0e3004b764df33b1098e2.tar.gz lwn-70be9ac2b64c0d0db4f0e3004b764df33b1098e2.zip | |
Merge tag 'pci-v5.0-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fix from Bjorn Helgaas:
"Work around Synopsys duplicate Device ID (HAPS USB3, NXP i.MX) that
breaks PCIe on I.MX SoCs (Thinh Nguyen)"
* tag 'pci-v5.0-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Work around Synopsys duplicate Device ID (HAPS USB3, NXP i.MX)
| -rw-r--r-- | drivers/pci/quirks.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index b0a413f3f7ca..e2a879e93d86 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -639,8 +639,9 @@ static void quirk_synopsys_haps(struct pci_dev *pdev) break; } } -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SYNOPSYS, PCI_ANY_ID, - quirk_synopsys_haps); +DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_SYNOPSYS, PCI_ANY_ID, + PCI_CLASS_SERIAL_USB_XHCI, 0, + quirk_synopsys_haps); /* * Let's make the southbridge information explicit instead of having to |