diff options
Diffstat (limited to 'drivers/acpi/acpica/hwsleep.c')
-rw-r--r-- | drivers/acpi/acpica/hwsleep.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c index 3c4a922a9fc2..af702a7a69d9 100644 --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c | |||
@@ -43,9 +43,9 @@ | |||
43 | */ | 43 | */ |
44 | 44 | ||
45 | #include <acpi/acpi.h> | 45 | #include <acpi/acpi.h> |
46 | #include <linux/acpi.h> | ||
46 | #include "accommon.h" | 47 | #include "accommon.h" |
47 | #include "actables.h" | 48 | #include "actables.h" |
48 | #include <linux/tboot.h> | ||
49 | #include <linux/module.h> | 49 | #include <linux/module.h> |
50 | 50 | ||
51 | #define _COMPONENT ACPI_HARDWARE | 51 | #define _COMPONENT ACPI_HARDWARE |
@@ -344,8 +344,12 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state) | |||
344 | 344 | ||
345 | ACPI_FLUSH_CPU_CACHE(); | 345 | ACPI_FLUSH_CPU_CACHE(); |
346 | 346 | ||
347 | tboot_sleep(sleep_state, pm1a_control, pm1b_control); | 347 | status = acpi_os_prepare_sleep(sleep_state, pm1a_control, |
348 | 348 | pm1b_control); | |
349 | if (ACPI_SKIP(status)) | ||
350 | return_ACPI_STATUS(AE_OK); | ||
351 | if (ACPI_FAILURE(status)) | ||
352 | return_ACPI_STATUS(status); | ||
349 | /* Write #2: Write both SLP_TYP + SLP_EN */ | 353 | /* Write #2: Write both SLP_TYP + SLP_EN */ |
350 | 354 | ||
351 | status = acpi_hw_write_pm1_control(pm1a_control, pm1b_control); | 355 | status = acpi_hw_write_pm1_control(pm1a_control, pm1b_control); |