aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xarch/arm/mach-ux500/cpuidle.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/cpuidle.c b/arch/arm/mach-ux500/cpuidle.c
index 447d10a1e18..8aa65de08d2 100755
--- a/arch/arm/mach-ux500/cpuidle.c
+++ b/arch/arm/mach-ux500/cpuidle.c
@@ -169,9 +169,13 @@ static int u8500_enter_idle(struct cpuidle_device *dev,
if (cstate->type == U8500_CSTATE_C2)
ret = wfi_retention_idle(dev, state);
- if (cstate->type == U8500_CSTATE_C0)
+ if (cstate->type == U8500_CSTATE_C0) {
ret = poll_idle(dev, state);
+ /* irq already enabled so just return. */
+ return ret;
+ }
+
local_irq_enable();
return ret;