diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 10:16:31 -0400 |
| commit | 2ee73cc2d507df7b28050fba5d08bd33dd34848c (patch) | |
| tree | af5f33b265318e0f4b61f788691fe4f780ec402c /drivers/macintosh | |
| parent | c1d9728ecc5b560465df3c0c0d3b3825c2710b40 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/macintosh')
| -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 a85ac18dd21d..9b38674fbf75 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) | |||
| 153 | spin_lock_irqsave(&smu->lock, flags); | 153 | spin_lock_irqsave(&smu->lock, flags); |
| 154 | 154 | ||
| 155 | gpio = pmac_do_feature_call(PMAC_FTR_READ_GPIO, NULL, smu->doorbell); | 155 | gpio = pmac_do_feature_call(PMAC_FTR_READ_GPIO, NULL, smu->doorbell); |
| 156 | if ((gpio & 7) != 7) | 156 | if ((gpio & 7) != 7) { |
| 157 | spin_unlock_irqrestore(&smu->lock, flags); | ||
| 157 | return IRQ_HANDLED; | 158 | return IRQ_HANDLED; |
| 159 | } | ||
| 158 | 160 | ||
| 159 | cmd = smu->cmd_cur; | 161 | cmd = smu->cmd_cur; |
| 160 | smu->cmd_cur = NULL; | 162 | smu->cmd_cur = NULL; |