[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index bb973d2109a1..c885300579ec 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -424,6 +424,7 @@ acpi_pci_irq_enable (
         int                     edge_level = ACPI_LEVEL_SENSITIVE;
         int                     active_high_low = ACPI_ACTIVE_LOW;
         char                    *link = NULL;
+        int                     rc;
 
         ACPI_FUNCTION_TRACE("acpi_pci_irq_enable");
 
@@ -476,7 +477,13 @@ acpi_pci_irq_enable (
                 }
         }
 
-        dev->irq = acpi_register_gsi(irq, edge_level, active_high_low);
+        rc = acpi_register_gsi(irq, edge_level, active_high_low);
+        if (rc < 0) {
+                printk(KERN_WARNING PREFIX "PCI Interrupt %s[%c]: failed "
+                       "to register GSI\n", pci_name(dev), ('A' + pin));
+                return_VALUE(rc);
+        }
+        dev->irq = rc;
 
         printk(KERN_INFO PREFIX "PCI Interrupt %s[%c] -> ",
                 pci_name(dev), 'A' + pin);