X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=kernel%2Fpower%2Fhibernate.c;h=33c79b6105c55fdc4f228bb0348fbc2b92d68f0f;hb=0aeeb3e73f5fd7faef3dce8cb590effd6ee51571;hp=a881c6a7ba74020db9d4fee663445112af0edcc8;hpb=835c92d43b29eb354abdbd5475308a474d7efdfa;p=deliverable%2Flinux.git

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index a881c6a7ba74..33c79b6105c5 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -300,12 +300,12 @@ static int create_image(int platform_mode)
 	save_processor_state();
 	trace_suspend_resume(TPS("machine_suspend"), PM_EVENT_HIBERNATE, true);
 	error = swsusp_arch_suspend();
+	/* Restore control flow magically appears here */
+	restore_processor_state();
 	trace_suspend_resume(TPS("machine_suspend"), PM_EVENT_HIBERNATE, false);
 	if (error)
 		printk(KERN_ERR "PM: Error %d creating hibernation image\n",
 			error);
-	/* Restore control flow magically appears here */
-	restore_processor_state();
 	if (!in_suspend)
 		events_check_enabled = false;