X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=kernel%2Fpower%2Fhibernate.c;h=50aae660174d6bd0b0697b6a70e4e31b2e1535f3;hb=07f9479a40cc778bc1462ada11f95b01360ae4ff;hp=aeabd26e3342788e4330cfb4e8e2a5ba40b348d0;hpb=ec616048ea21da2b32ed1a820e637c74c61c618c;p=cascardo%2Flinux.git

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index aeabd26e3342..50aae660174d 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -273,8 +273,11 @@ static int create_image(int platform_mode)
 	local_irq_disable();
 
 	error = sysdev_suspend(PMSG_FREEZE);
-	if (!error)
+	if (!error) {
 		error = syscore_suspend();
+		if (error)
+			sysdev_resume();
+	}
 	if (error) {
 		printk(KERN_ERR "PM: Some system devices failed to power down, "
 			"aborting hibernation\n");
@@ -407,8 +410,11 @@ static int resume_target_kernel(bool platform_mode)
 	local_irq_disable();
 
 	error = sysdev_suspend(PMSG_QUIESCE);
-	if (!error)
+	if (!error) {
 		error = syscore_suspend();
+		if (error)
+			sysdev_resume();
+	}
 	if (error)
 		goto Enable_irqs;