aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorSteve Zhan <zhanzhenbo@gmail.com>2013-01-23 11:24:47 +0100
committerLinus Walleij <linus.walleij@linaro.org>2013-01-23 12:51:09 +0100
commit5cc23666c3766705aac716bc517353cce8d68464 (patch)
treea558206e6a7edee778c5197f487b76305185c0ab /arch/arm
parenta1149ae975547142f78e96745a994cb9b0e98fd2 (diff)
downloadlinux-stericsson-5cc23666c3766705aac716bc517353cce8d68464.tar.gz
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>
Diffstat (limited to 'arch/arm')
-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 */