Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a89bca27 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki
Browse files

ACPI / x86: boot: Propagate error code in acpi_gsi_to_irq() 



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

Propagate it from acpi_gsi_to_irq() to callers.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
[ rjw : Subject/changelog ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 7c7bcfea

arch/x86/kernel/acpi/boot.c

+10 −10
Original line number Diff line number Diff line
@@ -619,18 +619,18 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp) 
	}



	rc = acpi_get_override_irq(gsi, &trigger, &polarity);

	if (rc == 0) {

	if (rc)

		return rc;



	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) {

	if (irq < 0)

		return irq;



	*irqp = irq;

	return 0;

}

	}



	return -1;

}

EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);



int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi)