---

yaml --- r: 144601 b: refs/heads/master c: e151a60 h: refs/heads/master i: 144599: 992befc v: v3
git-mirror · May 5, 2009 · 6a2ad99 · 6a2ad99
1 parent 2655fd9
commit 6a2ad99
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: 815bcc2719c12b6f5b511706e2d19728e07f0b02
+refs/heads/master: e151a60ad1faffb6241cf7eb6846353df1f33a32
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
@@ -3738,7 +3738,7 @@ static irqreturn_t e1000_intr(int irq, void *data)
 	struct e1000_hw *hw = &adapter->hw;
 	u32 rctl, icr = er32(ICR);
 
-	if (unlikely((!icr) || test_bit(__E1000_RESETTING, &adapter->flags)))
+	if (unlikely((!icr) || test_bit(__E1000_DOWN, &adapter->flags)))
 		return IRQ_NONE;  /* Not our interrupt */
 
 	/* IMS will not auto-mask if INT_ASSERTED is not set, and if it is