From: Steve Zhan <zhanzhenbo@gmail.com>
Date: Wed, 23 Jan 2013 10:24:47 +0000 (+0100)
Subject: ARM: ux500: add spin_unlock(&master_lock).
X-Git-Tag: v3.9-rc1~123^2~6^2~6^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cc23666c3766705aac716bc517353cce8d68464;p=thirdparty%2Flinux.git

ARM: ux500: add spin_unlock(&master_lock).

Add the missing spin_unlock statement to unlock
master_lock when prcmu_gic_decouple() return TRUE

Signed-off-by: steve zhan <zhanzhenbo@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/arch/arm/mach-ux500/cpuidle.c b/arch/arm/mach-ux500/cpuidle.c
index b54884bd25498..ce9149302cc3c 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 */