---

yaml --- r: 256008 b: refs/heads/master c: b9ab82c h: refs/heads/master v: v3
git-mirror · Jul 1, 2011 · 5ce0aa5 · 5ce0aa5
1 parent d8a5c3a
commit 5ce0aa5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 482c9e798738dea847a5e5e0d20692fe80d48a76
+refs/heads/master: b9ab82c774d8abcca8b6c1d5f30f5912a4448980
diff --git a/trunk/drivers/net/benet/be_main.c b/trunk/drivers/net/benet/be_main.c
@@ -3417,6 +3417,12 @@ static int __devinit be_probe(struct pci_dev *pdev,
 	if (status)
 		goto stats_clean;
 
+	/* The INTR bit may be set in the card when probed by a kdump kernel
+	 * after a crash.
+	 */
+	if (!lancer_chip(adapter))
+		be_intr_set(adapter, false);
+
 	be_msix_enable(adapter);
 
 	INIT_DELAYED_WORK(&adapter->work, be_worker);