---

yaml --- r: 168738 b: refs/heads/master c: b8a623b h: refs/heads/master v: v3
git-mirror · Nov 14, 2009 · 77696a6 · 77696a6
1 parent f1841af
commit 77696a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;