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

Commit 6c5f8039 authored by Jouni Hogander's avatar Jouni Hogander Committed by Kevin Hilman
Browse files

OMAP3: PM: Fix wrong sequence in suspend. 



Powerdomain previous state is checked after restoring new states in
suspend. This patch fixes this problem.

Signed-off-by: default avatarJouni Hogander <jouni.hogander@nokia.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 60c45ae1

arch/arm/mach-omap2/pm34xx.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,6 @@ static int omap3_pm_suspend(void) 
restore:

	/* Restore next_pwrsts */

	list_for_each_entry(pwrst, &pwrst_list, node) {

		set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state);

		state = pwrdm_read_prev_pwrst(pwrst->pwrdm);

		if (state > pwrst->next_state) {

			printk(KERN_INFO "Powerdomain (%s) didn't enter "
@@ -334,6 +333,7 @@ static int omap3_pm_suspend(void) 
			       pwrst->pwrdm->name, pwrst->next_state);

			ret = -1;

		}

		set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state);

	}

	if (ret)

		printk(KERN_ERR "Could not enter target state in pm_suspend\n");