projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a1149ae
)
ARM: ux500: add spin_unlock(&master_lock).
author
Steve Zhan
<zhanzhenbo@gmail.com>
Wed, 23 Jan 2013 10:24:47 +0000
(11:24 +0100)
committer
Linus Walleij
<linus.walleij@linaro.org>
Wed, 23 Jan 2013 11:51:09 +0000
(12:51 +0100)
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>
arch/arm/mach-ux500/cpuidle.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-ux500/cpuidle.c
b/arch/arm/mach-ux500/cpuidle.c
index
b54884b
..
ce91493
100644
(file)
--- 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 */