Skip to content

Commit

Permalink
Merge branch 'acpi-irq'
Browse files Browse the repository at this point in the history
Merge ACPI IRQ management fix for 6.6-rc7 (Sunil V L).

* acpi-irq:
  ACPI: irq: Fix incorrect return value in acpi_register_gsi()
  • Loading branch information
rafaeljw committed Oct 20, 2023
2 parents d5921c4 + 0c21a18 commit 9caa3a2
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/acpi/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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);

Expand Down

0 comments on commit 9caa3a2

Please sign in to comment.