diff options
| author | Jim Wylder <jwylder@motorola.com> | 2014-05-13 16:41:09 -0500 |
|---|---|---|
| committer | James Wylder <jwylder@motorola.com> | 2014-05-13 21:54:50 +0000 |
| commit | 4f35788d0f75354f071ff0a0b1ee54ef28d6b232 (patch) | |
| tree | c51bb571fdf46646c84bc6044c2315f3f0ea80f8 | |
| parent | e20f75277013675bb520add337411c3172fa9ad6 (diff) | |
| download | olio-linux-3.10-4f35788d0f75354f071ff0a0b1ee54ef28d6b232.tar.xz olio-linux-3.10-4f35788d0f75354f071ff0a0b1ee54ef28d6b232.zip | |
IKXCLOCK-1280 revert arm: omap2: pm should set suspend in early resume
The original change opened a window that is causing an infinite loop in the
prcm_clear_mod_irqs.
This reverts commit 5987c05866c63bc4484fba5bfe119d9448e5feb5.
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index f99dcf391e2..b06b22c3f64 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -209,8 +209,6 @@ static int omap_pm_enter(suspend_state_t suspend_state) case PM_SUSPEND_STANDBY: case PM_SUSPEND_MEM: ret = omap_pm_suspend(); - if (cpu_is_omap34xx()) - omap_prcm_irq_prepare(); break; default: ret = -EINVAL; @@ -222,6 +220,8 @@ static int omap_pm_enter(suspend_state_t suspend_state) static int omap_pm_begin(suspend_state_t state) { cpu_idle_poll_ctrl(true); + if (cpu_is_omap34xx()) + omap_prcm_irq_prepare(); return 0; } |