diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-09-20 23:45:56 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-09-20 23:45:56 +0400 |
commit | 1fdb4888e45f1413972a8e9da55f3ffc08b9abcb (patch) | |
tree | 635ef73cdff38d21a529bbdcab4cd2cb39a29484 /arch/arm/mach-omap2/pm.c | |
parent | 1884af9365a96314164f4110d4528d425e5dd843 (diff) | |
parent | ceb1c532ba6220900e61ec7073a9234661efa450 (diff) | |
download | linux-1fdb4888e45f1413972a8e9da55f3ffc08b9abcb.tar.xz |
Merge branch 'omap/cleanup' into next/cleanup
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
-rw-r--r-- | arch/arm/mach-omap2/pm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 3feb35911a32..472bf22d5e84 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -130,7 +130,6 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) } else { hwsup = clkdm_in_hwsup(pwrdm->pwrdm_clkdms[0]); clkdm_wakeup(pwrdm->pwrdm_clkdms[0]); - pwrdm_wait_transition(pwrdm); sleep_switch = FORCEWAKEUP_SWITCH; } } @@ -156,7 +155,6 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) return ret; } - pwrdm_wait_transition(pwrdm); pwrdm_state_switch(pwrdm); err: return ret; |