From 77696a6f447ab8fc148d7fb1d4a0448307d2ba9d Mon Sep 17 00:00:00 2001
From: Breno Leitao <leitao@linux.vnet.ibm.com>
Date: Tue, 10 Nov 2009 09:44:23 +0000
Subject: [PATCH] --- yaml --- r: 168738 b: refs/heads/master c:
 b8a623bf836ccfab09a5a6daf62116f455082e6e h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/s2io.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index da23604913bb..cb81cf14bf2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a78102e74e782914039cd8a6939532649825a2e3
+refs/heads/master: b8a623bf836ccfab09a5a6daf62116f455082e6e
diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c
index ddccf5fa56b6..0dd7839322bc 100644
--- a/trunk/drivers/net/s2io.c
+++ b/trunk/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;