diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-12 06:43:32 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-12 06:43:32 +0200 |
| commit | b6ec995a21a9428aef620b5adf46d047a18d88b8 (patch) | |
| tree | 6719121e6605cbca524b687f47336b9bbf3b8d41 /drivers/macintosh/smu.c | |
| parent | powerpc: make iSeries boot again (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.tar.xz linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.zip | |
Merge from Linus' tree
Diffstat (limited to 'drivers/macintosh/smu.c')
| -rw-r--r-- | drivers/macintosh/smu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index 5f283529620b..34f3c7e2d832 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; |