diff options
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/hardware/hwsleep.c | 2 | ||||
-rw-r--r-- | drivers/acpi/sleep/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c index fd1c4ba63367..058d0be5cbe2 100644 --- a/drivers/acpi/hardware/hwsleep.c +++ b/drivers/acpi/hardware/hwsleep.c | |||
@@ -286,13 +286,13 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state) | |||
286 | } | 286 | } |
287 | 287 | ||
288 | /* | 288 | /* |
289 | * 1) Disable/Clear all GPEs | ||
289 | * 2) Enable all wakeup GPEs | 290 | * 2) Enable all wakeup GPEs |
290 | */ | 291 | */ |
291 | status = acpi_hw_disable_all_gpes(); | 292 | status = acpi_hw_disable_all_gpes(); |
292 | if (ACPI_FAILURE(status)) { | 293 | if (ACPI_FAILURE(status)) { |
293 | return_ACPI_STATUS(status); | 294 | return_ACPI_STATUS(status); |
294 | } | 295 | } |
295 | |||
296 | acpi_gbl_system_awake_and_running = FALSE; | 296 | acpi_gbl_system_awake_and_running = FALSE; |
297 | 297 | ||
298 | status = acpi_hw_enable_all_wakeup_gpes(); | 298 | status = acpi_hw_enable_all_wakeup_gpes(); |
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 485de1347075..c9a733f36bd5 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c | |||
@@ -170,7 +170,7 @@ static int acpi_pm_enter(suspend_state_t pm_state) | |||
170 | /* Reprogram control registers and execute _BFS */ | 170 | /* Reprogram control registers and execute _BFS */ |
171 | acpi_leave_sleep_state_prep(acpi_state); | 171 | acpi_leave_sleep_state_prep(acpi_state); |
172 | 172 | ||
173 | /* ACPI 3.0 specs (P62) says that it's the responsabilty | 173 | /* ACPI 3.0 specs (P62) says that it's the responsibility |
174 | * of the OSPM to clear the status bit [ implying that the | 174 | * of the OSPM to clear the status bit [ implying that the |
175 | * POWER_BUTTON event should not reach userspace ] | 175 | * POWER_BUTTON event should not reach userspace ] |
176 | */ | 176 | */ |