commit 3704a6a445790e6621c19be25d85dfadbeb16a69
author Dexuan Cui <decui@microsoft.com> Tue Mar 31 08:55:25 2020 -0700
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> Wed Apr 01 11:36:11 2020 +0200
tree 0ebe7037a9d15ea687d63ceada43850e86076c7d
parent 2ce94bc4e056d3e48291aac87a95ebd2a86348ba

PM: hibernate: Propagate the return value of hibernation_restore()

If hibernation_restore() fails, the 'error' should not be zero.

Signed-off-by: Dexuan Cui <decui@microsoft.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

kernel/power/hibernate.c

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 6dbeedb..86aba87 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -678,7 +678,7 @@ static int load_image_and_restore(void)
 	error = swsusp_read(&flags);
 	swsusp_close(FMODE_READ);
 	if (!error)
-		hibernation_restore(flags & SF_PLATFORM_MODE);
+		error = hibernation_restore(flags & SF_PLATFORM_MODE);
 
 	pr_err("Failed to load image, recovering.\n");
 	swsusp_free();