From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Wed, 7 Jul 2010 21:43:35 +0000 (+0200)
Subject: PM / Hibernate: Fix snapshot error code path
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d074ee023fa3a4681b64223c5e636102c39628c4;p=linux.git

PM / Hibernate: Fix snapshot error code path

There is an inconsistency between hibernation_platform_enter()
and hibernation_snapshot(), because the latter calls
hibernation_ops->end() after failing hibernation_ops->begin(), while
the former doesn't do that.  Make hibernation_snapshot() behave in
the same way as hibernation_platform_enter() in that respect.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Len Brown <len.brown@intel.com>
---

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index d97ba8615c30e..d26f04e927437 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -330,7 +330,7 @@ int hibernation_snapshot(int platform_mode)
 
 	error = platform_begin(platform_mode);
 	if (error)
-		return error;
+		goto Close;
 
 	/* Preallocate image memory before shutting down devices. */
 	error = hibernate_preallocate_memory();