From c45ae1a185b8e893edf9d0bc22ff973da29b48c1 Mon Sep 17 00:00:00 2001
From: Jouni Hogander <jouni.hogander@nokia.com>
Date: Wed, 29 Oct 2008 12:06:04 +0200
Subject: [PATCH] --- yaml --- r: 156823 b: refs/heads/master c:
 6c5f80393b107b0c9e2a54b03b65d1880e706655 h: refs/heads/master i:   156821:
 062f1dcf7def98365efbef713ab872073e044418   156819:
 4246582d7e7ca1db13db6c7622393b592b4e66e8   156815:
 de1f775e42e74c57bf508948fff32b4b3fe47cac v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-omap2/pm34xx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fa0eb67274aa..a99fb8f37e36 100644
--- 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
index b07efb26de18..488d595d8e4b 100644
--- a/trunk/arch/arm/mach-omap2/pm34xx.c
+++ b/trunk/arch/arm/mach-omap2/pm34xx.c
@@ -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");