diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-07 11:46:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-07 11:46:56 +0100 |
| commit | 9f9e4266a66b6f9dcde305e85035615c06bdb7f7 (patch) | |
| tree | c6f867c7a1bf94a3b4f13b19a9ce442c7aec9e79 /arch/arm/mach-omap2/cpuidle44xx.c | |
| parent | bf551413038f74343ec4d1413c3610e2362d0aeb (diff) | |
| parent | 249ce1387b7739dbea2ac1a697e4bf1e37ec06b7 (diff) | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-twl6040
Diffstat (limited to 'arch/arm/mach-omap2/cpuidle44xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/cpuidle44xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c index c443f2e97e10..4c8982ae9529 100644 --- a/arch/arm/mach-omap2/cpuidle44xx.c +++ b/arch/arm/mach-omap2/cpuidle44xx.c @@ -143,7 +143,7 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev, * Call idle CPU cluster PM exit notifier chain * to restore GIC and wakeupgen context. */ - if ((cx->mpu_state == PWRDM_POWER_RET) && + if (dev->cpu == 0 && (cx->mpu_state == PWRDM_POWER_RET) && (cx->mpu_logic_state == PWRDM_POWER_OFF)) cpu_cluster_pm_exit(); |