diff options
author | Nick Nunley <nicholasx.d.nunley@intel.com> | 2010-02-16 20:02:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-17 16:21:33 -0500 |
commit | b94f2d775a71ed09dc8ca2bf24c611bdce9e82e7 (patch) | |
tree | 05aa580db96c9ebc1ad67aea289d6d2c9c6ab6ff /drivers/net/igb/igb_main.c | |
parent | 88a268c1a11a2e94b7c55a8cfe97892d845887c8 (diff) |
igb: call pci_save_state after pci_restore_state
This patch adds calls to pci_save_state() immediately after
calls to pci_restore_state(). Due to a change in the behavior
of pci_restore_state() it is necessary to call pci_save_state()
to keep the state_saved flag. This patch is based on a similar
patch for ixgbe.
Signed-off-by: Nicholas Nunley <nicholasx.d.nunley@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb/igb_main.c')
-rw-r--r-- | drivers/net/igb/igb_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 0427e7c10295..089a7c3f4c69 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -5885,6 +5885,7 @@ static int igb_resume(struct pci_dev *pdev) | |||
5885 | 5885 | ||
5886 | pci_set_power_state(pdev, PCI_D0); | 5886 | pci_set_power_state(pdev, PCI_D0); |
5887 | pci_restore_state(pdev); | 5887 | pci_restore_state(pdev); |
5888 | pci_save_state(pdev); | ||
5888 | 5889 | ||
5889 | err = pci_enable_device_mem(pdev); | 5890 | err = pci_enable_device_mem(pdev); |
5890 | if (err) { | 5891 | if (err) { |
@@ -6010,6 +6011,7 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev) | |||
6010 | } else { | 6011 | } else { |
6011 | pci_set_master(pdev); | 6012 | pci_set_master(pdev); |
6012 | pci_restore_state(pdev); | 6013 | pci_restore_state(pdev); |
6014 | pci_save_state(pdev); | ||
6013 | 6015 | ||
6014 | pci_enable_wake(pdev, PCI_D3hot, 0); | 6016 | pci_enable_wake(pdev, PCI_D3hot, 0); |
6015 | pci_enable_wake(pdev, PCI_D3cold, 0); | 6017 | pci_enable_wake(pdev, PCI_D3cold, 0); |