diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-02 00:52:19 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-02 00:52:19 +0100 |
| commit | 9bb4064ca3bd771f8df88529a3578f9bb5243911 (patch) | |
| tree | a148f0ff6ee2f5bb6d556ac7a39e30311862eafd /drivers/acpi/sleep.c | |
| parent | Merge branches 'acpi-osl', 'acpi-pad', 'acpi-video' and 'acpi-assorted' (diff) | |
| parent | PM / hibernate: fix a comment typo (diff) | |
| download | linux-dev-9bb4064ca3bd771f8df88529a3578f9bb5243911.tar.xz linux-dev-9bb4064ca3bd771f8df88529a3578f9bb5243911.zip | |
Merge branch 'pm-sleep'
* pm-sleep:
PM / hibernate: fix a comment typo
input: i8042: Avoid resetting controller on system suspend/resume
PM / PCI / ACPI: Kick devices that might have been reset by firmware
PM / sleep: Add flags to indicate platform firmware involvement
PM / sleep: Drop pm_request_idle() from pm_generic_complete()
PCI / PM: Avoid resuming more devices during system suspend
PM / wakeup: wakeup_source_create: use kstrdup_const
PM / sleep: Report interrupt that caused system wakeup
Diffstat (limited to 'drivers/acpi/sleep.c')
| -rw-r--r-- | drivers/acpi/sleep.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 3fe1fbec7677..0d94621dc856 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -487,6 +487,8 @@ static int acpi_suspend_begin(suspend_state_t pm_state) pr_err("ACPI does not support sleep state S%u\n", acpi_state); return -ENOSYS; } + if (acpi_state > ACPI_STATE_S1) + pm_set_suspend_via_firmware(); acpi_pm_start(acpi_state); return 0; @@ -522,6 +524,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state) if (error) return error; pr_info(PREFIX "Low-level resume complete\n"); + pm_set_resume_via_firmware(); break; } trace_suspend_resume(TPS("acpi_suspend"), acpi_state, false); |