diff options
Diffstat (limited to 'drivers/acpi/sleep.c')
-rw-r--r-- | drivers/acpi/sleep.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 2b38c1bb0446..deb0ff78eba8 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
@@ -572,7 +572,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state) | |||
572 | 572 | ||
573 | acpi_get_event_status(ACPI_EVENT_POWER_BUTTON, &pwr_btn_status); | 573 | acpi_get_event_status(ACPI_EVENT_POWER_BUTTON, &pwr_btn_status); |
574 | 574 | ||
575 | if (pwr_btn_status & ACPI_EVENT_FLAG_SET) { | 575 | if (pwr_btn_status & ACPI_EVENT_FLAG_STATUS_SET) { |
576 | acpi_clear_event(ACPI_EVENT_POWER_BUTTON); | 576 | acpi_clear_event(ACPI_EVENT_POWER_BUTTON); |
577 | /* Flag for later */ | 577 | /* Flag for later */ |
578 | pwr_btn_event_pending = true; | 578 | pwr_btn_event_pending = true; |
@@ -586,7 +586,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state) | |||
586 | */ | 586 | */ |
587 | acpi_disable_all_gpes(); | 587 | acpi_disable_all_gpes(); |
588 | /* Allow EC transactions to happen. */ | 588 | /* Allow EC transactions to happen. */ |
589 | acpi_ec_unblock_transactions_early(); | 589 | acpi_ec_unblock_transactions(); |
590 | 590 | ||
591 | suspend_nvs_restore(); | 591 | suspend_nvs_restore(); |
592 | 592 | ||
@@ -784,7 +784,7 @@ static void acpi_hibernation_leave(void) | |||
784 | /* Restore the NVS memory area */ | 784 | /* Restore the NVS memory area */ |
785 | suspend_nvs_restore(); | 785 | suspend_nvs_restore(); |
786 | /* Allow EC transactions to happen. */ | 786 | /* Allow EC transactions to happen. */ |
787 | acpi_ec_unblock_transactions_early(); | 787 | acpi_ec_unblock_transactions(); |
788 | } | 788 | } |
789 | 789 | ||
790 | static void acpi_pm_thaw(void) | 790 | static void acpi_pm_thaw(void) |