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

Commit 2ca6f62f authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM: Fix error code paths executed after failing syscore_suspend() 



If syscore_suspend() fails in suspend_enter(), create_image() or
resume_target_kernel(), it is necessary to call sysdev_resume(),
because sysdev_suspend() has been called already and succeeded
and we are going to abort the transition.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a1b49cb7

kernel/power/hibernate.c

+8 −2
Original line number Diff line number Diff line
@@ -273,8 +273,11 @@ static int create_image(int platform_mode) 
	local_irq_disable();



	error = sysdev_suspend(PMSG_FREEZE);

	if (!error)

	if (!error) {

		error = syscore_suspend();

		if (error)

			sysdev_resume();

	}

	if (error) {

		printk(KERN_ERR "PM: Some system devices failed to power down, "

			"aborting hibernation\n");
@@ -407,8 +410,11 @@ static int resume_target_kernel(bool platform_mode) 
	local_irq_disable();



	error = sysdev_suspend(PMSG_QUIESCE);

	if (!error)

	if (!error) {

		error = syscore_suspend();

		if (error)

			sysdev_resume();

	}

	if (error)

		goto Enable_irqs;

kernel/power/suspend.c

+4 −1
Original line number Diff line number Diff line
@@ -164,8 +164,11 @@ static int suspend_enter(suspend_state_t state) 
	BUG_ON(!irqs_disabled());



	error = sysdev_suspend(PMSG_SUSPEND);

	if (!error)

	if (!error) {

		error = syscore_suspend();

		if (error)

			sysdev_resume();

	}

	if (!error) {

		if (!(suspend_test(TEST_CORE) || pm_wakeup_pending())) {

			error = suspend_ops->enter(state);