Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfcbb008 authored by Brice Goglin's avatar Brice Goglin Committed by Jeff Garzik
Browse files

[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 99dc804d (PCI: disable msi mode
in pci_disable_device) now prevents pci_save_state() from disabling MSI.

Signed-off-by: default avatarBrice Goglin <brice@myri.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 69eb887b

drivers/net/myri10ge/myri10ge.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -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

	/* Save configuration space to be restored if the

	 * nic resets due to a parity error */

	 * nic resets due to a parity error */

	myri10ge_save_state(mgp);

	myri10ge_save_state(mgp);

	/* Restore state immediately since pci_save_msi_state disables MSI */

	myri10ge_restore_state(mgp);





	/* Setup the watchdog timer */

	/* Setup the watchdog timer */

	setup_timer(&mgp->watchdog_timer, myri10ge_watchdog_timer,

	setup_timer(&mgp->watchdog_timer, myri10ge_watchdog_timer,