From 0db18726f9c35e5da6a388ac37e8afb49a30c4d5 Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@ti.com>
Date: Mon, 16 Aug 2010 09:21:19 +0300
Subject: [PATCH] --- yaml --- r: 210065 b: refs/heads/master c:
 58a5559e461a4ab945286dacef611d3c542c5fee h: refs/heads/master i:   210063:
 47d13867c00b2a0c2b28be771b8a2b86d6d9022d v: v3

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

diff --git a/[refs] b/[refs]
index 9e44d320b585..b4fe60b99a1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c66dd2660de534973303e2dd4f7784763bc9e549
+refs/heads/master: 58a5559e461a4ab945286dacef611d3c542c5fee
diff --git a/trunk/arch/arm/mach-omap2/pm34xx.c b/trunk/arch/arm/mach-omap2/pm34xx.c
index fb4994ad622e..7b03426c72a3 100644
--- a/trunk/arch/arm/mach-omap2/pm34xx.c
+++ b/trunk/arch/arm/mach-omap2/pm34xx.c
@@ -480,7 +480,9 @@ void omap_sram_idle(void)
 	}
 
 	/* Disable IO-PAD and IO-CHAIN wakeup */
-	if (omap3_has_io_wakeup() && core_next_state < PWRDM_POWER_ON) {
+	if (omap3_has_io_wakeup() &&
+	    (per_next_state < PWRDM_POWER_ON ||
+	     core_next_state < PWRDM_POWER_ON)) {
 		prm_clear_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD, PM_WKEN);
 		omap3_disable_io_chain();
 	}