aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds2015-08-27 17:59:17 -0700
committerLinus Torvalds2015-08-27 17:59:17 -0700
commit4941b8f0c2b9d88e8a6dacebf8b7faf603b98368 (patch)
tree9b7e30a20c1f9d0db678f0ac10a33d2d917b49ca /arch
parente001d7084a687c7a25b02bee47548a1df10d6e0b (diff)
parent4d9aac397a5d8f4ee26a4178b5e4a5c474a3a76a (diff)
Merge tag 'powerpc-4.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman: "Fix MSI/MSI-X on pseries from Guilherme" * tag 'powerpc-4.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/PCI: Disable MSI/MSI-X interrupts at PCI probe time in OF case PCI: Make pci_msi_setup_pci_dev() non-static for use by arch code
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/pci_of_scan.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
index 42e02a2d570b..efc3fa54c90b 100644
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -191,6 +191,9 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
pci_device_add(dev, bus);
+ /* Setup MSI caps & disable MSI/MSI-X interrupts */
+ pci_msi_setup_pci_dev(dev);
+
return dev;
}
EXPORT_SYMBOL(of_create_pci_dev);