Skip to content

Commit 3fa7787

Browse files
committed
Merge tag 'acpi-6.18-rc8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki: "One more urgent ACPI support fix for 6.18 There is one more commit that needs to be reverted after reverting problematic commit 7a8c994 ("ACPI: processor: idle: Optimize ACPI idle driver registration"), so revert it" * tag 'acpi-6.18-rc8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: Revert "ACPI: processor: Update cpuidle driver check in __acpi_processor_start()"
2 parents e1afacb + fbf0421 commit 3fa7787

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/acpi/processor_driver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ static int __acpi_processor_start(struct acpi_device *device)
166166
if (result && !IS_ENABLED(CONFIG_ACPI_CPU_FREQ_PSS))
167167
dev_dbg(&device->dev, "CPPC data invalid or not present\n");
168168

169-
if (cpuidle_get_driver() == &acpi_idle_driver)
169+
if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
170170
acpi_processor_power_init(pr);
171171

172172
acpi_pss_perf_init(pr);

0 commit comments

Comments
 (0)