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

Commit e091fb26 authored by Sunil V L's avatar Sunil V L Committed by Greg Kroah-Hartman
Browse files

ACPI: irq: Fix incorrect return value in acpi_register_gsi() 



commit 0c21a18d5d6c6a73d098fb9b4701572370942df9 upstream.

acpi_register_gsi() should return a negative value in case of failure.

Currently, it returns the return value from irq_create_fwspec_mapping().
However, irq_create_fwspec_mapping() returns 0 for failure. Fix the
issue by returning -EINVAL if irq_create_fwspec_mapping() returns zero.

Fixes: d44fa3d4 ("ACPI: Add support for ResourceSource/IRQ domain mapping")
Cc: 4.11+ <stable@vger.kernel.org> # 4.11+
Signed-off-by: default avatarSunil V L <sunilvl@ventanamicro.com>
[ rjw: Rename a new local variable ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 42d3d975

drivers/acpi/irq.c

+6 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, 
		      int polarity)

{

	struct irq_fwspec fwspec;

	unsigned int irq;



	if (WARN_ON(!acpi_gsi_domain_id)) {

		pr_warn("GSI: No registered irqchip, giving up\n");
@@ -66,7 +67,11 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, 
	fwspec.param[1] = acpi_dev_get_irq_type(trigger, polarity);

	fwspec.param_count = 2;



	return irq_create_fwspec_mapping(&fwspec);

	irq = irq_create_fwspec_mapping(&fwspec);

	if (!irq)

		return -EINVAL;



	return irq;

}

EXPORT_SYMBOL_GPL(acpi_register_gsi);