diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-14 14:14:47 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-14 14:14:47 +0000 |
| commit | 13ea3300100ec3461560b1e061033cd167333a86 (patch) | |
| tree | c60a016a06c488adada6959516e2a2de96d6d7d3 /drivers/acpi/sleep.c | |
| parent | b7ed6b88b2a5e961eeb939ef637a3cbb435a23a7 (diff) | |
| parent | 68e67d97e1f91ed11e041b67f3a1336f518c608f (diff) | |
Merge branch 'topic/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-rspi
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); |