Skip to content

Commit

Permalink
[PATCH] myri10ge - drop workaround pci_save_state() disabling MSI
Browse files Browse the repository at this point in the history
We don't need to restore the state right after saving it for later recovery
since commit 99dc804 (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>
  • Loading branch information
Brice Goglin authored and Jeff Garzik committed Jun 23, 2006
1 parent 69eb887 commit bfcbb00
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions drivers/net/myri10ge/myri10ge.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit bfcbb00

Please sign in to comment.