Commit b8a623bf authored Nov 10, 2009 by Breno Leitao Committed by David S. Miller Nov 13, 2009

s2io: fixing a ethtool test that is broken



Due commit 4b77b0a2, it is not more
possible to pci_restore_state() more than once without calling
pci_save_state() in the middle.

Actually running a ethtool test on s2io makes the card inactive,
and it needs to unload/reload the module to fix.

This patch just save the state just after it restore in order to
keep the old behaviour

Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a78102e7

drivers/net/s2io.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -3494,6 +3494,7 @@ static void s2io_reset(struct s2io_nic *sp)

		/* Restore the PCI state saved during initialization. */
		pci_restore_state(sp->pdev);
		pci_save_state(sp->pdev);
		pci_read_config_word(sp->pdev, 0x2, &val16);
		if (check_pci_device_id(val16) != (u16)PCI_ANY_ID)
		break;