diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:32 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:32 -0500 |
| commit | 79598324838a25cc378ecbb8c29dd1e3d3951d35 (patch) | |
| tree | 7d29e81580cba854042df4e33bdc8f38bbd65d03 /drivers/net/s2io.c | |
| parent | 8ee763b9c82c6ca0a59a7271ce4fa29d7baf5c09 (diff) | |
| parent | b00615d163cd24fa98d155acfc1f9d81d6fe1103 (diff) | |
Merge branch 'topic/core-change' into for-linus
Diffstat (limited to 'drivers/net/s2io.c')
| -rw-r--r-- | drivers/net/s2io.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index ddccf5fa56b6..0dd7839322bc 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
| @@ -3494,6 +3494,7 @@ static void s2io_reset(struct s2io_nic *sp) | |||
| 3494 | 3494 | ||
| 3495 | /* Restore the PCI state saved during initialization. */ | 3495 | /* Restore the PCI state saved during initialization. */ |
| 3496 | pci_restore_state(sp->pdev); | 3496 | pci_restore_state(sp->pdev); |
| 3497 | pci_save_state(sp->pdev); | ||
| 3497 | pci_read_config_word(sp->pdev, 0x2, &val16); | 3498 | pci_read_config_word(sp->pdev, 0x2, &val16); |
| 3498 | if (check_pci_device_id(val16) != (u16)PCI_ANY_ID) | 3499 | if (check_pci_device_id(val16) != (u16)PCI_ANY_ID) |
| 3499 | break; | 3500 | break; |