summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/cpuidle.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-ux500/cpuidle.c')
-rw-r--r--arch/arm/mach-ux500/cpuidle.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/cpuidle.c b/arch/arm/mach-ux500/cpuidle.c
index b54884bd2549..ce9149302cc3 100644
--- a/arch/arm/mach-ux500/cpuidle.c
+++ b/arch/arm/mach-ux500/cpuidle.c
@@ -40,8 +40,10 @@ static inline int ux500_enter_idle(struct cpuidle_device *dev,
goto wfi;
/* decouple the gic from the A9 cores */
- if (prcmu_gic_decouple())
+ if (prcmu_gic_decouple()) {
+ spin_unlock(&master_lock);
goto out;
+ }
/* If an error occur, we will have to recouple the gic
* manually */