Commit f20f29cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "These fix the ACPI initialization ordering on ARM and ACPI IRQ
  management in the cases when irq_create_fwspec_mapping() fails.

  Specifics:

   - Fix ACPI initialization ordering on ARM that was changed
     incorrectly during the 6.5 development cycle (Hanjun Guo)

   - Make acpi_register_gsi() return an error code as appropriate when
     irq_create_fwspec_mapping() returns 0 on failure (Sunil V L)"

* tag 'acpi-6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: bus: Move acpi_arm_init() to the place of after acpi_ghes_init()
  ACPI: irq: Fix incorrect return value in acpi_register_gsi()
parents 75e167c2 9caa3a2d

drivers/acpi/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -1410,10 +1410,10 @@ static int __init acpi_init(void) 
	acpi_init_ffh();



	pci_mmcfg_late_init();

	acpi_arm_init();

	acpi_viot_early_init();

	acpi_hest_init();

	acpi_ghes_init();

	acpi_arm_init();

	acpi_scan_init();

	acpi_ec_init();

	acpi_debugfs_init();

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);