|
@@ -619,17 +619,17 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp)
|
|
|
}
|
|
|
|
|
|
rc = acpi_get_override_irq(gsi, &trigger, &polarity);
|
|
|
- if (rc == 0) {
|
|
|
- trigger = trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE;
|
|
|
- polarity = polarity ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH;
|
|
|
- irq = acpi_register_gsi(NULL, gsi, trigger, polarity);
|
|
|
- if (irq >= 0) {
|
|
|
- *irqp = irq;
|
|
|
- return 0;
|
|
|
- }
|
|
|
- }
|
|
|
+ if (rc)
|
|
|
+ return rc;
|
|
|
|
|
|
- return -1;
|
|
|
+ trigger = trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE;
|
|
|
+ polarity = polarity ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH;
|
|
|
+ irq = acpi_register_gsi(NULL, gsi, trigger, polarity);
|
|
|
+ if (irq < 0)
|
|
|
+ return irq;
|
|
|
+
|
|
|
+ *irqp = irq;
|
|
|
+ return 0;
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);
|
|
|
|