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 d97ba8615c30ea1903937469ff1cf2daedb8ed4d..d26f04e927437a153b08182b6f01d2b2dfed1357 100644 (file)
--- 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();