Commit 3bd0a2c1 authored by Imre Deak's avatar Imre Deak Committed by Luis Henriques

PM / Sleep: fix recovery during resuming from hibernation

commit 94fb823f 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: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 228ed728
...@@ -505,8 +505,14 @@ int hibernation_restore(int platform_mode) ...@@ -505,8 +505,14 @@ int hibernation_restore(int platform_mode)
error = dpm_suspend_start(PMSG_QUIESCE); error = dpm_suspend_start(PMSG_QUIESCE);
if (!error) { if (!error) {
error = resume_target_kernel(platform_mode); 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(); pm_restore_gfp_mask();
ftrace_start(); ftrace_start();
resume_console(); resume_console();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment