diff options
| author | Imre Deak <imre.deak@intel.com> | 2014-10-24 20:29:10 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 09:00:10 -0800 |
| commit | 99af83075631f0a8fc9ade6b72b4ce1cc9d587e8 (patch) | |
| tree | 4f3663d6ff2c8dafa233b1dc646082e7c337a854 | |
| parent | 2ceee507fac81179f206691fec3163839c5dd5d8 (diff) | |
| download | linux-stable-99af83075631f0a8fc9ade6b72b4ce1cc9d587e8.tar.gz linux-stable-99af83075631f0a8fc9ade6b72b4ce1cc9d587e8.tar.bz2 linux-stable-99af83075631f0a8fc9ade6b72b4ce1cc9d587e8.zip | |
PM / Sleep: fix recovery during resuming from hibernation
commit 94fb823fcb4892614f57e59601bb9d4920f24711 upstream.
If a device's dev_pm_ops::freeze callback fails during the QUIESCE
phase, we don't rollback things correctly calling the thaw and complete
callbacks. This could leave some devices in a suspended state in case of
an error during resuming from hibernation.
Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | kernel/power/hibernate.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 37170d4dd9a6..126586a31408 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -492,8 +492,14 @@ int hibernation_restore(int platform_mode) error = dpm_suspend_start(PMSG_QUIESCE); if (!error) { error = resume_target_kernel(platform_mode); - dpm_resume_end(PMSG_RECOVER); + /* + * The above should either succeed and jump to the new kernel, + * or return with an error. Otherwise things are just + * undefined, so let's be paranoid. + */ + BUG_ON(!error); } + dpm_resume_end(PMSG_RECOVER); pm_restore_gfp_mask(); ftrace_start(); resume_console(); |