Commit 9caa3a2d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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()
parents d5921c46 0c21a18d

drivers/acpi/irq.c

+6 −1
Original line number Diff line number Diff line
@@ -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);