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>

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index b0f6c4a2a119b4070af243d5ed72d88544b55ac5..b718806657cdac29d9ccb3a1cad3fe6528865176 100644 (file)
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -807,12 +807,7 @@ int __init acpi_sleep_init(void)
        acpi_sleep_hibernate_setup();
 
        status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
-       /*
-        * Check both ACPI S5 object and ACPI sleep registers to
-        * install pm_power_off_prepare/pm_power_off hook
-        */
-       if (ACPI_SUCCESS(status) && acpi_gbl_FADT.sleep_control.address
-           && acpi_gbl_FADT.sleep_status.address) {
+       if (ACPI_SUCCESS(status)) {
                sleep_states[ACPI_STATE_S5] = 1;
                pm_power_off_prepare = acpi_power_off_prepare;
                pm_power_off = acpi_power_off;