---

yaml --- r: 315046 b: refs/heads/master c: d663d18 h: refs/heads/master v: v3
git-mirror · Jul 9, 2012 · 926dcdb · 926dcdb
1 parent 99a5b64
commit 926dcdb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e767324f26fd5e103381d05a65a76ecf50a699a
+refs/heads/master: d663d181b9e92d80c2455e460e932d34e7a2a7ae
diff --git a/trunk/drivers/net/ethernet/marvell/sky2.c b/trunk/drivers/net/ethernet/marvell/sky2.c
@@ -3080,8 +3080,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]);