summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLino Sanfilippo <LinoSanfilippo@gmx.de>2014-11-30 12:51:31 +0100
committerDavid S. Miller <davem@davemloft.net>2014-12-06 06:33:19 +0100
commit6276288a4c1f755e6b65b0f2e1177855b0340e31 (patch)
tree4240c6f3a5e422639a835a25eaba246c6ececed4 /drivers
parentpxa168: close race between napi and irq activation (diff)
downloadlinux-6276288a4c1f755e6b65b0f2e1177855b0340e31.tar.xz
linux-6276288a4c1f755e6b65b0f2e1177855b0340e31.zip
skge: Unmask interrupts in case of spurious interrupts
In case of a spurious interrupt dont forget to reenable the interrupts that have been masked by reading the interrupt source register. Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de> Acked-by: Mirko Lindner <mlindner@marvell.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/marvell/skge.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index 264eab7d3b26..7173836fe361 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -3433,10 +3433,9 @@ static irqreturn_t skge_intr(int irq, void *dev_id)
if (status & IS_HW_ERR)
skge_error_irq(hw);
-
+out:
skge_write32(hw, B0_IMSK, hw->intr_mask);
skge_read32(hw, B0_IMSK);
-out:
spin_unlock(&hw->hw_lock);
return IRQ_RETVAL(handled);