aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-09 18:30:50 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2014-03-09 13:48:36 -0700
commit4c7b70406e5aadc1c78db4d375d5744df65c5b58 (patch)
treeb39a654122495832609a808e2f6d037e5b120da5
parentca62eec4e524591b82d9edf7a18e3ae6b691517d (diff)
downloadlinux-4c7b70406e5aadc1c78db4d375d5744df65c5b58.tar.gz
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>
-rw-r--r--drivers/acpi/sleep.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index b0f6c4a2a119..b718806657cd 100644
--- 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;