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

Configure Feed

Select the types of activity you want to include in your feed.

Revert "ACPI / sleep: pm_power_off needs more sanity checks to be installed"

Revert commit 3130497f5bab ("ACPI / sleep: pm_power_off needs more
sanity checks to be installed") that breaks power ACPI power off on a
lot of systems, because it checks wrong registers.

Fixes: 3130497f5bab ("ACPI / sleep: pm_power_off needs more sanity checks to be installed")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Rafael J. Wysocki and committed by
Linus Torvalds 4c7b7040 ca62eec4

+1 -6
+1 -6
drivers/acpi/sleep.c
··· 807 807 acpi_sleep_hibernate_setup(); 808 808 809 809 status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b); 810 - /* 811 - * Check both ACPI S5 object and ACPI sleep registers to 812 - * install pm_power_off_prepare/pm_power_off hook 813 - */ 814 - if (ACPI_SUCCESS(status) && acpi_gbl_FADT.sleep_control.address 815 - && acpi_gbl_FADT.sleep_status.address) { 810 + if (ACPI_SUCCESS(status)) { 816 811 sleep_states[ACPI_STATE_S5] = 1; 817 812 pm_power_off_prepare = acpi_power_off_prepare; 818 813 pm_power_off = acpi_power_off;