---

yaml --- r: 355116 b: refs/heads/master c: 5cc2366 h: refs/heads/master v: v3
git-mirror · Jan 23, 2013 · 17317a8 · 17317a8
1 parent 6fc3bcc
commit 17317a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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 */