summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/pm.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-09-20 23:45:56 +0400
committerArnd Bergmann <arnd@arndb.de>2011-09-20 23:45:56 +0400
commit1fdb4888e45f1413972a8e9da55f3ffc08b9abcb (patch)
tree635ef73cdff38d21a529bbdcab4cd2cb39a29484 /arch/arm/mach-omap2/pm.c
parent1884af9365a96314164f4110d4528d425e5dd843 (diff)
parentceb1c532ba6220900e61ec7073a9234661efa450 (diff)
downloadlinux-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.c2
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;