Commit 70be9ac2 authored Feb 08, 2019 by Linus Torvalds

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)

parents e2dac603 f57a98e1

drivers/pci/quirks.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -639,7 +639,8 @@ static void quirk_synopsys_haps(struct pci_dev *pdev)
		break;
		}
		}
		DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SYNOPSYS, PCI_ANY_ID,
		DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_SYNOPSYS, PCI_ANY_ID,
		PCI_CLASS_SERIAL_USB_XHCI, 0,
		quirk_synopsys_haps);

		/*

Admin message