Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5262a475 authored by MyungJoo Ham's avatar MyungJoo Ham Committed by Rafael J. Wysocki
Browse files

PM / Hibernate: When failed, in_suspend should be reset 



When hibernation failed due to an error in swsusp_write() called by
hibernate(), it skips calling "power_down()" and returns. When
hibernate() is called again (probably after fixing up so that
swsusp_write() wouldn't fail again), before "in_suspend = 1" of
create_image is called, in_suspend should be 0. However, because
hibernate() did not reset "in_suspend" after a failure, it's already 1.

This patch fixes such inconsistency of "in_suspend" value.

Signed-off-by: default avatarMyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 5729c63a

kernel/power/hibernate.c

+1 −0
Original line number Diff line number Diff line
@@ -647,6 +647,7 @@ int hibernate(void) 
		swsusp_free();

		if (!error)

			power_down();

		in_suspend = 0;

		pm_restore_gfp_mask();

	} else {

		pr_debug("PM: Image restored successfully.\n");