git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
cpuidle44xx.c
diff --git
a/arch/arm/mach-omap2/cpuidle44xx.c
b/arch/arm/mach-omap2/cpuidle44xx.c
index 6f5f89711f256f87ebe93fffc8445c97cee82ad4..a92d277f81a081876960aea5f409f636b5976dd5 100644
(file)
--- a/
arch/arm/mach-omap2/cpuidle44xx.c
+++ b/
arch/arm/mach-omap2/cpuidle44xx.c
@@
-174,8
+174,10
@@
static int omap_enter_idle_coupled(struct cpuidle_device *dev,
*/
if (mpuss_can_lose_context) {
error = cpu_cluster_pm_enter();
- if (error)
+ if (error) {
+ omap_set_pwrdm_state(mpu_pd, PWRDM_POWER_ON);
goto cpu_cluster_pm_out;
+ }
}
}