Skip to contentSkip to conversation

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

PATCH Applied Dexuan Cui 2 participants 2 messages Mar 31, 2020 – Apr 1, 2020

Subsystems (2)
lore
Share & tools
lore

Dexuan Cui

author
#0 lore raw

PATCH 1/1 PM: hibernate: Propagate the return value of hibernation_restore()

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

---
 kernel/power/hibernate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/power/hibernate.c +1 -1
index 6dbeedb..86aba87 100644
@@ -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();
Signature · 1 line
1.8.3.1
maintainer Applied
#1 lore raw
Quoted 13 lines · Dexuan Cui

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

---
 kernel/power/hibernate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/power/hibernate.c +0 -0
index 6dbeedb..86aba87 100644

kernel/power/hibernate.c static int load_image_and_restore(void)

Quoted 9 lines
kernel/power/hibernate.c +1 -2
@@ -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();
--

Applied as 5.7-rc material, thanks!