Merge branch 'pci/msi' into next

* pci/msi: PCI: Disable MSI for HiSilicon Hip06/Hip07 only in Root Port mode

Merge branch 'pci/msi' into next
* pci/msi: PCI: Disable MSI for HiSilicon Hip06/Hip07 only in Root Port mode
11377725 · Bjorn Helgaas · Bjorn Helgaas · 412ee7cd · deb86999 · 11377725
Commit 11377725 authored Jan 31, 2018 by Bjorn Helgaas Committed by Bjorn Helgaas Jan 31, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/pci/quirks.c drivers/pci/quirks.c +1 -1

No files found.
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1633,8 +1633,8 @@ static void quirk_pcie_mch(struct pci_dev *pdev)
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_E7520_MCH,	quirk_pcie_mch);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_E7320_MCH,	quirk_pcie_mch);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_E7525_MCH,	quirk_pcie_mch);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI,	0x1610,	quirk_pcie_mch);

+DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_HUAWEI, 0x1610, PCI_CLASS_BRIDGE_PCI, 8, quirk_pcie_mch);

 /*
 * It's possible for the MSI to get corrupted if shpc and acpi