summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-09-30 08:25:17 +1000
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-29 15:42:58 -0700
commita44fe13eab664ac488ced0845d9885b019bd24c5 (patch)
tree83da95a5b4b6a9b30c7c3dd0e129b589082b61aa /drivers/macintosh
parent7644143cd6f7e029f3a8ea64f5fb0ab33ec39f72 (diff)
downloadop-kernel-dev-a44fe13eab664ac488ced0845d9885b019bd24c5.zip
op-kernel-dev-a44fe13eab664ac488ced0845d9885b019bd24c5.tar.gz
[PATCH] Fix ppc64 smu driver locking
The SMU driver has a small mistake in the locking of the interrupt code, if polled access and interrupt access race, interrupt may take a lock and return without releasing it. This fixes it. With that patch, the driver is rock solid with my experimental thermal control (which bangs it pretty hard) racing with real time clock and cpufreq handling. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/macintosh')
-rw-r--r--drivers/macintosh/smu.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index a85ac18..9b38674 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -153,8 +153,10 @@ static irqreturn_t smu_db_intr(int irq, void *arg, struct pt_regs *regs)
spin_lock_irqsave(&smu->lock, flags);
gpio = pmac_do_feature_call(PMAC_FTR_READ_GPIO, NULL, smu->doorbell);
- if ((gpio & 7) != 7)
+ if ((gpio & 7) != 7) {
+ spin_unlock_irqrestore(&smu->lock, flags);
return IRQ_HANDLED;
+ }
cmd = smu->cmd_cur;
smu->cmd_cur = NULL;
OpenPOWER on IntegriCloud