Skip to content

Commit

Permalink
[ACPI] acpi_pci_enable_irq() now checks for acpi_register_gsi() errors
Browse files Browse the repository at this point in the history
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Kenji Kaneshige authored and Len Brown committed Aug 5, 2005
1 parent 1f3a6a1 commit 349f0d5
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion drivers/acpi/pci_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down Expand Up @@ -475,7 +476,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);
Expand Down

0 comments on commit 349f0d5

Please sign in to comment.