---

yaml --- r: 28849 b: refs/heads/master c: bfcbb00 h: refs/heads/master i: 28847: 54cf36f v: v3
git-mirror · Jun 23, 2006 · 875fa02 · 875fa02
1 parent edb9216
commit 875fa02
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69eb887b0c2380791d33f7c07bfba88d7c5cef15
+refs/heads/master: bfcbb00855db21dacd3c154ea13ec3fdd98e747b
diff --git a/trunk/drivers/net/myri10ge/myri10ge.c b/trunk/drivers/net/myri10ge/myri10ge.c
@@ -2726,8 +2726,6 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	/* Save configuration space to be restored if the
 	 * nic resets due to a parity error */
 	myri10ge_save_state(mgp);
-	/* Restore state immediately since pci_save_msi_state disables MSI */
-	myri10ge_restore_state(mgp);
 
 	/* Setup the watchdog timer */
 	setup_timer(&mgp->watchdog_timer, myri10ge_watchdog_timer,