Skip to content

Commit 9caa3a2

Browse files
committed
Merge branch 'acpi-irq'
Merge ACPI IRQ management fix for 6.6-rc7 (Sunil V L). * acpi-irq: ACPI: irq: Fix incorrect return value in acpi_register_gsi()
2 parents d5921c4 + 0c21a18 commit 9caa3a2

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/acpi/irq.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,
5757
int polarity)
5858
{
5959
struct irq_fwspec fwspec;
60+
unsigned int irq;
6061

6162
fwspec.fwnode = acpi_get_gsi_domain_id(gsi);
6263
if (WARN_ON(!fwspec.fwnode)) {
@@ -68,7 +69,11 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,
6869
fwspec.param[1] = acpi_dev_get_irq_type(trigger, polarity);
6970
fwspec.param_count = 2;
7071

71-
return irq_create_fwspec_mapping(&fwspec);
72+
irq = irq_create_fwspec_mapping(&fwspec);
73+
if (!irq)
74+
return -EINVAL;
75+
76+
return irq;
7277
}
7378
EXPORT_SYMBOL_GPL(acpi_register_gsi);
7479

0 commit comments

Comments
 (0)