Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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()
+7
-2
+1
-1
drivers/acpi/bus.c
+1
-1
drivers/acpi/bus.c
+6
-1
drivers/acpi/irq.c
+6
-1
drivers/acpi/irq.c
···
57
57
int polarity)
58
58
{
59
59
struct irq_fwspec fwspec;
60
+
unsigned int irq;
60
61
61
62
fwspec.fwnode = acpi_get_gsi_domain_id(gsi);
62
63
if (WARN_ON(!fwspec.fwnode)) {
···
69
68
fwspec.param[1] = acpi_dev_get_irq_type(trigger, polarity);
70
69
fwspec.param_count = 2;
71
70
72
-
return irq_create_fwspec_mapping(&fwspec);
71
+
irq = irq_create_fwspec_mapping(&fwspec);
72
+
if (!irq)
73
+
return -EINVAL;
74
+
75
+
return irq;
73
76
}
74
77
EXPORT_SYMBOL_GPL(acpi_register_gsi);
75
78