[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 99dc804d9b
(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>
This commit is contained in:
parent
69eb887b0c
commit
bfcbb00855
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user