From 17317a857bbba81e83f4aef3bf08da562db4d67d Mon Sep 17 00:00:00 2001
From: Steve Zhan <zhanzhenbo@gmail.com>
Date: Wed, 23 Jan 2013 11:24:47 +0100
Subject: [PATCH] --- yaml --- r: 355116 b: refs/heads/master c:
 5cc23666c3766705aac716bc517353cce8d68464 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/mach-ux500/cpuidle.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c3f9460c6396..51dd5d84db45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1149ae975547142f78e96745a994cb9b0e98fd2
+refs/heads/master: 5cc23666c3766705aac716bc517353cce8d68464
diff --git a/trunk/arch/arm/mach-ux500/cpuidle.c b/trunk/arch/arm/mach-ux500/cpuidle.c
index b54884bd2549..ce9149302cc3 100644
--- a/trunk/arch/arm/mach-ux500/cpuidle.c
+++ b/trunk/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 */