[ACPI] acpi_pci_enable_irq() now checks for acpi_register_gsi() errors
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>
This commit is contained in:
parent
1f3a6a1577
commit
349f0d5640
@ -424,6 +424,7 @@ acpi_pci_irq_enable (
|
|||||||
int edge_level = ACPI_LEVEL_SENSITIVE;
|
int edge_level = ACPI_LEVEL_SENSITIVE;
|
||||||
int active_high_low = ACPI_ACTIVE_LOW;
|
int active_high_low = ACPI_ACTIVE_LOW;
|
||||||
char *link = NULL;
|
char *link = NULL;
|
||||||
|
int rc;
|
||||||
|
|
||||||
ACPI_FUNCTION_TRACE("acpi_pci_irq_enable");
|
ACPI_FUNCTION_TRACE("acpi_pci_irq_enable");
|
||||||
|
|
||||||
@ -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] -> ",
|
printk(KERN_INFO PREFIX "PCI Interrupt %s[%c] -> ",
|
||||||
pci_name(dev), 'A' + pin);
|
pci_name(dev), 'A' + pin);
|
||||||
|
Loading…
Reference in New Issue
Block a user