| Message ID | 1257882263-7507-1-git-send-email-leitao@linux.vnet.ibm.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: leitao@linux.vnet.ibm.com Date: Tue, 10 Nov 2009 14:44:23 -0500 > Due commit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff, 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> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index ddccf5f..0dd7839 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -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;
Due commit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff, 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> --- drivers/net/s2io.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)