diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-18 13:16:30 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-18 13:16:30 +1100 |
| commit | c71327ad9f925a4ddbf24db80ce66165104c4ed0 (patch) | |
| tree | a1560ddfb827d580843d2a32ba19fb0fc85490d8 /drivers/ata/sata_mv.c | |
| parent | f507cd22035fdadd5dbb476dd05e9e7ee21c3b84 (diff) | |
| parent | a4bd6a93c3f14691c8a29e53eb04dc734b27f0db (diff) | |
Merge commit 'gcl/merge' into merge
Diffstat (limited to 'drivers/ata/sata_mv.c')
| -rw-r--r-- | drivers/ata/sata_mv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 7007edd2d451..74b1080d116d 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -2218,12 +2218,13 @@ static irqreturn_t mv_interrupt(int irq, void *dev_instance) else handled = mv_host_intr(host, pending_irqs); } - spin_unlock(&host->lock); /* for MSI: unmask; interrupt cause bits will retrigger now */ if (using_msi) writel(hpriv->main_irq_mask, hpriv->main_irq_mask_addr); + spin_unlock(&host->lock); + return IRQ_RETVAL(handled); } |