summaryrefslogtreecommitdiff
path: root/drivers/acpi/sleep.c
diff options
context:
space:
mode:
authorLi, Aubrey <aubrey.li@linux.intel.com>2014-03-02 08:53:57 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-03 00:21:14 +0100
commit3130497f5babd42b24a7febda46b46116e0adc83 (patch)
tree3e70fd441ef9fd16ed23db14aab063bbb8684aae /drivers/acpi/sleep.c
parentcfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff)
ACPI / sleep: pm_power_off needs more sanity checks to be installed
Sleep control and status registers need santity checks as well before ACPI installs acpi_power_off to pm_power_off hook. The checking code in acpi_enter_sleep_state() is too late, we should not allow a not-working pm_power_off function to be hooked up. Signed-off-by: Aubrey Li <aubrey.li@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/sleep.c')
-rw-r--r--drivers/acpi/sleep.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index b718806657cd..b0f6c4a2a119 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -807,7 +807,12 @@ int __init acpi_sleep_init(void)
acpi_sleep_hibernate_setup();
status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
- if (ACPI_SUCCESS(status)) {
+ /*
+ * 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) {
sleep_states[ACPI_STATE_S5] = 1;
pm_power_off_prepare = acpi_power_off_prepare;
pm_power_off = acpi_power_off;