aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/pci_irq.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-05 00:31:42 -0400
committerLen Brown <len.brown@intel.com>2005-08-05 00:31:42 -0400
commit1d492eb41371d9a5145651e8eb64bea1042a4057 (patch)
tree2a66a8fd347cf8dd8a665c4575b30d873035a5a4 /drivers/acpi/pci_irq.c
parent5d2a22079c825669d91a3a200332f1053b4b61b0 (diff)
parentcbfc1bae55bbd053308ef0fa6b6448cd1ddf3e67 (diff)
[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/pci_irq.c')
-rw-r--r--drivers/acpi/pci_irq.c9
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 (
424 int edge_level = ACPI_LEVEL_SENSITIVE; 424 int edge_level = ACPI_LEVEL_SENSITIVE;
425 int active_high_low = ACPI_ACTIVE_LOW; 425 int active_high_low = ACPI_ACTIVE_LOW;
426 char *link = NULL; 426 char *link = NULL;
427 int rc;
427 428
428 ACPI_FUNCTION_TRACE("acpi_pci_irq_enable"); 429 ACPI_FUNCTION_TRACE("acpi_pci_irq_enable");
429 430
@@ -476,7 +477,13 @@ acpi_pci_irq_enable (
476 } 477 }
477 } 478 }
478 479
479 dev->irq = acpi_register_gsi(irq, edge_level, active_high_low); 480 rc = acpi_register_gsi(irq, edge_level, active_high_low);
481 if (rc < 0) {
482 printk(KERN_WARNING PREFIX "PCI Interrupt %s[%c]: failed "
483 "to register GSI\n", pci_name(dev), ('A' + pin));
484 return_VALUE(rc);
485 }
486 dev->irq = rc;
480 487
481 printk(KERN_INFO PREFIX "PCI Interrupt %s[%c] -> ", 488 printk(KERN_INFO PREFIX "PCI Interrupt %s[%c] -> ",
482 pci_name(dev), 'A' + pin); 489 pci_name(dev), 'A' + pin);