From: Sunil V L Date: Mon, 16 Oct 2023 17:09:39 +0000 (+0530) Subject: ACPI: irq: Fix incorrect return value in acpi_register_gsi() X-Git-Tag: v6.6.7~1698^2^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c21a18d5d6c6a73d098fb9b4701572370942df9;p=platform%2Fkernel%2Flinux-starfive.git ACPI: irq: Fix incorrect return value in acpi_register_gsi() 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: d44fa3d46079 ("ACPI: Add support for ResourceSource/IRQ domain mapping") Cc: 4.11+ # 4.11+ Signed-off-by: Sunil V L [ rjw: Rename a new local variable ] Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c index c2c786e..1687483 100644 --- a/drivers/acpi/irq.c +++ b/drivers/acpi/irq.c @@ -57,6 +57,7 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) { struct irq_fwspec fwspec; + unsigned int irq; fwspec.fwnode = acpi_get_gsi_domain_id(gsi); if (WARN_ON(!fwspec.fwnode)) { @@ -68,7 +69,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);