From 7dea7f3684b5276dea3e949612c5e04b117fcc59 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Wed, 9 Jun 2010 13:53:09 +0300 Subject: [PATCH] --- yaml --- r: 200661 b: refs/heads/master c: 0b96a3a3c5c5e6e1b79a05c23d110d59518f4fc8 h: refs/heads/master i: 200659: f8bd6b9907f08d27b3c38713ba7aba0d7ad52ae1 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/pm34xx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ac8506f192dc..102aaa74388e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7ec0b0b16c97a75a1b6aa8bc8b32548003f3339 +refs/heads/master: 0b96a3a3c5c5e6e1b79a05c23d110d59518f4fc8 diff --git a/trunk/arch/arm/mach-omap2/pm34xx.c b/trunk/arch/arm/mach-omap2/pm34xx.c index 2e967716cc3f..b88737fd6cfe 100644 --- a/trunk/arch/arm/mach-omap2/pm34xx.c +++ b/trunk/arch/arm/mach-omap2/pm34xx.c @@ -99,7 +99,7 @@ static void omap3_enable_io_chain(void) /* Do a readback to assure write has been done */ prm_read_mod_reg(WKUP_MOD, PM_WKEN); - while (!(prm_read_mod_reg(WKUP_MOD, PM_WKST) & + while (!(prm_read_mod_reg(WKUP_MOD, PM_WKEN) & OMAP3430_ST_IO_CHAIN_MASK)) { timeout++; if (timeout > 1000) { @@ -108,7 +108,7 @@ static void omap3_enable_io_chain(void) return; } prm_set_mod_reg_bits(OMAP3430_ST_IO_CHAIN_MASK, - WKUP_MOD, PM_WKST); + WKUP_MOD, PM_WKEN); } } }