From 021334e23862e408d4d4c73790eb6b3a3ed61cb8 Mon Sep 17 00:00:00 2001
From: Mohan V <mohanv@ti.com>
Date: Fri, 22 Jun 2012 08:40:02 -0600
Subject: [PATCH] --- yaml --- r: 313552 b: refs/heads/master c:
 fe7ea0062f2f846bb68447c7b813b9230285dbeb h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 691df200e25d..eb263be52740 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75a4433e409b2d22cbe443b623d92047b59cbb9a
+refs/heads/master: fe7ea0062f2f846bb68447c7b813b9230285dbeb
diff --git a/trunk/arch/arm/mach-omap2/pm34xx.c b/trunk/arch/arm/mach-omap2/pm34xx.c
index a34023d0ca7c..6d7f0d8a3103 100644
--- a/trunk/arch/arm/mach-omap2/pm34xx.c
+++ b/trunk/arch/arm/mach-omap2/pm34xx.c
@@ -81,16 +81,17 @@ static void omap3_enable_io_chain(void)
 	/* Do a readback to assure write has been done */
 	omap2_prm_read_mod_reg(WKUP_MOD, PM_WKEN);
 
-	while (!(omap2_prm_read_mod_reg(WKUP_MOD, PM_WKEN) &
+	while (!(omap2_prm_read_mod_reg(WKUP_MOD, PM_WKST) &
 		 OMAP3430_ST_IO_CHAIN_MASK)) {
 		timeout++;
 		if (timeout > 1000) {
 			pr_err("Wake up daisy chain activation failed.\n");
 			return;
 		}
-		omap2_prm_set_mod_reg_bits(OMAP3430_ST_IO_CHAIN_MASK,
-					   WKUP_MOD, PM_WKEN);
 	}
+	omap2_prm_clear_mod_reg_bits(OMAP3430_EN_IO_CHAIN_MASK, WKUP_MOD,
+				     PM_WKEN);
+
 }
 
 static void omap3_disable_io_chain(void)