Re-add check for valid acpi routing information, instead of assuming it works

diff --git a/arch/i386/pci/acpi.c b/arch/i386/pci/acpi.c
index efae58e0f04b1a489ebe7659c6f4c3c1509f1ec5..7d272e129b0604d889e3235b9afb827abd298899 100644 (file)
--- a/arch/i386/pci/acpi.c
+++ b/arch/i386/pci/acpi.c
@@ -59,10 +59,14 @@ static int acpi_lookup_irq (
 static int __init pci_acpi_init(void)
 {
        if (!(pci_probe & PCI_NO_ACPI_ROUTING)) {
-               printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
-               printk(KERN_INFO "PCI: if you experience problems, try using option 'pci=noacpi'\n");
-               pci_use_acpi_routing = 1;
-               pci_lookup_irq = acpi_lookup_irq;
+               if (acpi_prts.count) {
+                       printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
+                       printk(KERN_INFO "PCI: if you experience problems, try using option 'pci=noacpi'\n");
+                       pci_use_acpi_routing = 1;
+                       pci_lookup_irq = acpi_lookup_irq;
+               } else
+                       printk(KERN_WARNING "PCI: Invalid ACPI-PCI IRQ routing table\n");
+
        }
        return 0;
 }