diff options
author | Imre Deak <imre.deak@intel.com> | 2014-10-24 20:29:10 +0300 |
---|---|---|
committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-13 11:48:48 +0000 |
commit | 3bd0a2c1c916a4f174f354c514a31d3510bea75d (patch) | |
tree | a1d241e1a544f1cb5f66546f4c6f2c55e46d6769 /kernel/power | |
parent | 228ed7285af306967be0505584fe318fc8d247fa (diff) | |
download | linux-stable-3bd0a2c1c916a4f174f354c514a31d3510bea75d.tar.gz linux-stable-3bd0a2c1c916a4f174f354c514a31d3510bea75d.tar.bz2 linux-stable-3bd0a2c1c916a4f174f354c514a31d3510bea75d.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: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'kernel/power')
-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 fcc2611d3f14..286ef6072714 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -505,8 +505,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(); |