aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrice Goglin <brice@myri.com>2006-06-22 21:12:36 -0400
committerJeff Garzik <jeff@garzik.org>2006-06-22 23:35:19 -0400
commitbfcbb00855db21dacd3c154ea13ec3fdd98e747b (patch)
tree507cfad1eb90150516984d964580c19127233b3c
parent69eb887b0c2380791d33f7c07bfba88d7c5cef15 (diff)
[PATCH] myri10ge - drop workaround pci_save_state() disabling MSI
We don't need to restore the state right after saving it for later recovery since commit 99dc804d9bcc2c53f4c20c291bf4e185312a1a0c (PCI: disable msi mode in pci_disable_device) now prevents pci_save_state() from disabling MSI. Signed-off-by: Brice Goglin <brice@myri.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/myri10ge/myri10ge.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 5058def3b625..5a74f63618bc 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -2726,8 +2726,6 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2726 /* Save configuration space to be restored if the 2726 /* Save configuration space to be restored if the
2727 * nic resets due to a parity error */ 2727 * nic resets due to a parity error */
2728 myri10ge_save_state(mgp); 2728 myri10ge_save_state(mgp);
2729 /* Restore state immediately since pci_save_msi_state disables MSI */
2730 myri10ge_restore_state(mgp);
2731 2729
2732 /* Setup the watchdog timer */ 2730 /* Setup the watchdog timer */
2733 setup_timer(&mgp->watchdog_timer, myri10ge_watchdog_timer, 2731 setup_timer(&mgp->watchdog_timer, myri10ge_watchdog_timer,