---

yaml --- r: 156823 b: refs/heads/master c: 6c5f803 h: refs/heads/master i: 156821: 062f1dc 156819: 4246582 156815: de1f775 v: v3
git-mirror · Aug 5, 2009 · c45ae1a · c45ae1a
1 parent 9a111d3
commit c45ae1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60c45ae1107c4ec47d2c84e5984ea59d02b2863d
+refs/heads/master: 6c5f80393b107b0c9e2a54b03b65d1880e706655
diff --git a/trunk/arch/arm/mach-omap2/pm34xx.c b/trunk/arch/arm/mach-omap2/pm34xx.c
@@ -326,14 +326,14 @@ 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 "
 			       "target state %d\n",
 			       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");