Skip to contentSkip to conversation

ACPI / boot: Don't shadow error code in acpi_gsi_to_irq()

PATCH New Andy Shevchenko 1 participant 1 message Jan 2, 2018

Subsystems (2)
x86 ACPI
lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH 1/1 ACPI / boot: Don't shadow error code in acpi_gsi_to_irq()

acpi_get_override_irq() followed by acpi_register_gsi() return negative error code on failure.

Don't shadow them in acpi_gsi_to_irq().

Signed-off-by Andy Shevchenko <[email protected]>
---
 arch/x86/kernel/acpi/boot.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
arch/x86/kernel/acpi/boot.c +10 -10
index 290b6f5a2d50..cd5745e598fb 100644
@@ -622,17 +622,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);
Signature · 1 line
2.15.1