ACPI: irq: Fix the incorrect return value in acpi_register_gsi()
PATCH 1/1 ACPI: irq: Fix the incorrect return value in acpi_register_gsi()
acpi_register_gsi() should return 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.
--- drivers/acpi/irq.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/acpi/irq.c +6 -1
@@ -57,6 +57,7 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) {struct irq_fwspec fwspec; +unsigned int rc; 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); + rc =irq_create_fwspec_mapping (&fwspec); +if (!rc) +return -EINVAL ; + +return rc; }EXPORT_SYMBOL_GPL (acpi_register_gsi);
Signature · 1 line
2.39.2
Rafael J. Wysocki
maintainerQuoted 28 lines · Sunil V L
acpi_register_gsi()should return negative value in case of failure. Currently, it returns the return value fromirq_create_fwspec_mapping(). However,irq_create_fwspec_mapping()returns 0 for failure. Fix the issue by returning-EINVALifirq_create_fwspec_mapping()returns zero.Fixes d44fa3d46079 ("ACPI: Add support for ResourceSource/IRQ domain mapping")Signed-off-by Sunil V L <[email protected]>--- drivers/acpi/irq.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/acpi/irq.c +1
-0@@ -57,6 +57,7 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) {struct irq_fwspec fwspec; +unsigned int rc; 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 ;
drivers/acpi/irq.c int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,
Quoted 10 lines
drivers/acpi/irq.c +5
-2-return irq_create_fwspec_mapping (&fwspec); + rc =irq_create_fwspec_mapping (&fwspec); +if (!rc) +return -EINVAL ; + +return rc; }EXPORT_SYMBOL_GPL (acpi_register_gsi); --
Good catch!
Applied as 6.7 material, but I renamed the new rc local variable to irq.
Thanks!
Rafael J. Wysocki
maintainerQuoted 39 lines · Rafael J. Wysocki
Quoted 37 lines · Sunil V L
acpi_register_gsi()should return negative value in case of failure. Currently, it returns the return value fromirq_create_fwspec_mapping(). However,irq_create_fwspec_mapping()returns 0 for failure. Fix the issue by returning-EINVALifirq_create_fwspec_mapping()returns zero.Fixes d44fa3d46079 ("ACPI: Add support for ResourceSource/IRQ domain mapping")Signed-off-by Sunil V L <[email protected]>--- drivers/acpi/irq.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/acpi/irq.c +6
-1@@ -57,6 +57,7 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) {struct irq_fwspec fwspec; +unsigned int rc; 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); + rc =irq_create_fwspec_mapping (&fwspec); +if (!rc) +return -EINVAL ; + +return rc; }EXPORT_SYMBOL_GPL (acpi_register_gsi);
Quoted 7 lines
Quoted 1 line
--
Good catch!
Applied as 6.7 material, but I renamed the new rc local variable to irq.
Thanks!
Actually, I'm going to push this for -rc7.