diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-02 13:37:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-02 13:37:41 +0000 |
| commit | e80b89ee2ace3a959c44c834231851fc5242eb13 (patch) | |
| tree | ec8cd7a9cd05002261fbfda9b4ea4f66d1e04f7b /drivers/acpi/sleep.c | |
| parent | 85cfe6b64d785b170367322d9d130a530db7b276 (diff) | |
| parent | dc1ccc48159d63eca5089e507c82c7d22ef60839 (diff) | |
Merge tag 'v3.13-rc2' into spi-rcar
Linux 3.13-rc2
Diffstat (limited to 'drivers/acpi/sleep.c')
| -rw-r--r-- | drivers/acpi/sleep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 14df30580e1..721e949e606 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -525,7 +525,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state) * generate wakeup events. */ if (ACPI_SUCCESS(status) && (acpi_state == ACPI_STATE_S3)) { - acpi_event_status pwr_btn_status; + acpi_event_status pwr_btn_status = ACPI_EVENT_FLAG_DISABLED; acpi_get_event_status(ACPI_EVENT_POWER_BUTTON, &pwr_btn_status); |