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

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
...@@ -326,7 +326,6 @@ static int omap3_pm_suspend(void) ...@@ -326,7 +326,6 @@ static int omap3_pm_suspend(void)
restore: restore:
/* Restore next_pwrsts */ /* Restore next_pwrsts */
list_for_each_entry(pwrst, &pwrst_list, node) { list_for_each_entry(pwrst, &pwrst_list, node) {
set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state);
state = pwrdm_read_prev_pwrst(pwrst->pwrdm); state = pwrdm_read_prev_pwrst(pwrst->pwrdm);
if (state > pwrst->next_state) { if (state > pwrst->next_state) {
printk(KERN_INFO "Powerdomain (%s) didn't enter " printk(KERN_INFO "Powerdomain (%s) didn't enter "
...@@ -334,6 +333,7 @@ static int omap3_pm_suspend(void) ...@@ -334,6 +333,7 @@ static int omap3_pm_suspend(void)
pwrst->pwrdm->name, pwrst->next_state); pwrst->pwrdm->name, pwrst->next_state);
ret = -1; ret = -1;
} }
set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state);
} }
if (ret) if (ret)
printk(KERN_ERR "Could not enter target state in pm_suspend\n"); printk(KERN_ERR "Could not enter target state in pm_suspend\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment