Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / net / ethernet / marvell / sky2.c

diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 11ddd83..69fc888 100644 (file)
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -3060,8 +3060,10 @@ static irqreturn_t sky2_intr(int irq, void *dev_id)
 
        /* Reading this mask interrupts as side effect */
        status = sky2_read32(hw, B0_Y2_SP_ISRC2);
-       if (status == 0 || status == ~0)
+       if (status == 0 || status == ~0) {
+               sky2_write32(hw, B0_Y2_SP_ICR, 2);
                return IRQ_NONE;
+       }
 
        prefetch(&hw->st_le[hw->st_idx]);