---

yaml --- r: 171780 b: refs/heads/master c: a68ea77 h: refs/heads/master v: v3
git-mirror · Nov 21, 2009 · 8aa5d54 · 8aa5d54
1 parent e09fbc2
commit 8aa5d54
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7d906f714994885b4889d02d6478e7a9418dcbe
+refs/heads/master: a68ea775ad24ff403437c967628d2b9ce531ce48
diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c
@@ -1176,7 +1176,7 @@ static irqreturn_t e1000_intr(int irq, void *data)
 	struct e1000_hw *hw = &adapter->hw;
 	u32 rctl, icr = er32(ICR);
 
-	if (!icr)
+	if (!icr || test_bit(__E1000_DOWN, &adapter->state))
 		return IRQ_NONE;  /* Not our interrupt */
 
 	/*