Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "ACPI: scan: Turn off unused power resources during initialization"

Revert commit 4b9ee772eaa8 ("ACPI: scan: Turn off unused power
resources during initialization") that is reported to cause
initialization issues to occur.

Reported-by: Shujun Wang <wsj20369@163.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

+2 -4
-1
drivers/acpi/internal.h
··· 139 139 int acpi_power_get_inferred_state(struct acpi_device *device, int *state); 140 140 int acpi_power_on_resources(struct acpi_device *device, int state); 141 141 int acpi_power_transition(struct acpi_device *device, int state); 142 - void acpi_turn_off_unused_power_resources(void); 143 142 144 143 /* -------------------------------------------------------------------------- 145 144 Device Power Management
+1 -1
drivers/acpi/power.c
··· 996 996 997 997 mutex_unlock(&power_resource_list_lock); 998 998 } 999 - #endif 1000 999 1001 1000 void acpi_turn_off_unused_power_resources(void) 1002 1001 { ··· 1016 1017 1017 1018 mutex_unlock(&power_resource_list_lock); 1018 1019 } 1020 + #endif
-2
drivers/acpi/scan.c
··· 2360 2360 } 2361 2361 } 2362 2362 2363 - acpi_turn_off_unused_power_resources(); 2364 - 2365 2363 acpi_scan_initialized = true; 2366 2364 2367 2365 out:
+1
drivers/acpi/sleep.h
··· 8 8 extern struct mutex acpi_device_lock; 9 9 10 10 extern void acpi_resume_power_resources(void); 11 + extern void acpi_turn_off_unused_power_resources(void); 11 12 12 13 static inline acpi_status acpi_set_waking_vector(u32 wakeup_address) 13 14 {