X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=kernel%2Fpower%2Fhibernate.c;h=126586a31408777c74d54afff684a699c587695f;hb=99af83075631f0a8fc9ade6b72b4ce1cc9d587e8;hp=37170d4dd9a61d1ad1171d106c61af8d59393f85;hpb=379dd277edd0e19edf91710849b520629c3be4b2;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 37170d4..126586a 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();