Commit 94fb823f authored Oct 24, 2014 by Imre Deak Committed by Rafael J. Wysocki Oct 27, 2014

PM / Sleep: fix recovery during resuming from hibernation



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>
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 246ef766

kernel/power/hibernate.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -502,8 +502,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();
		resume_console();
		pm_restore_console();