[focal:linux-azure][PATCH 19/21] PM: hibernate: Propagate the return value of hibernation_restore()

[Marcelo Henrique Cerri]

From: Dexuan Cui <decui at microsoft.com>

BugLink: http://bugs.launchpad.net/bugs/1880032

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

Signed-off-by: Dexuan Cui <decui at microsoft.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki at intel.com>
(cherry picked from commit 3704a6a445790e6621c19be25d85dfadbeb16a69)
Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
---
 kernel/power/hibernate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index b6c5895ced36..5944a4c13e28 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 hibernation image, recovering.\n");
 	swsusp_free();
-- 
2.25.1