diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-12-29 10:08:45 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-12-29 10:08:45 +0100 |
| commit | 92b86f92ed0307efbaea3c0e95520551848d3995 (patch) | |
| tree | 20db0701571353b7e20a9417516616b4b60ebffa /drivers/pci/probe.c | |
| parent | a4289dc2ec3a5821076a78ee9678909b4eff297e (diff) | |
| parent | 0644b3daca28dcb320373ae20069c269c9386304 (diff) | |
| download | linux-92b86f92ed0307efbaea3c0e95520551848d3995.tar.bz2 | |
Merge branch 'irq/gic-v2m-acpi' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull another round of GIC changes from Marc:
ACPI support for GIV-v2m
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index edb1984201e9..553a029e37f1 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -672,6 +672,8 @@ static struct irq_domain *pci_host_bridge_msi_domain(struct pci_bus *bus) * should be called from here. */ d = pci_host_bridge_of_msi_domain(bus); + if (!d) + d = pci_host_bridge_acpi_msi_domain(bus); return d; } |