Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / drivers / pci / probe.c

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index edb1984201e9702162321c50f33f76ba362bac5a..553a029e37f15586c96198a098cbb40de91ef49a 100644 (file)
--- 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;
 }