diff options
| author | Nick Nunley <nicholasx.d.nunley@intel.com> | 2010-02-17 01:02:19 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-17 13:21:33 -0800 |
| commit | b94f2d775a71ed09dc8ca2bf24c611bdce9e82e7 (patch) | |
| tree | 05aa580db96c9ebc1ad67aea289d6d2c9c6ab6ff /drivers/net/igb | |
| parent | 88a268c1a11a2e94b7c55a8cfe97892d845887c8 (diff) | |
| download | op-kernel-dev-b94f2d775a71ed09dc8ca2bf24c611bdce9e82e7.zip op-kernel-dev-b94f2d775a71ed09dc8ca2bf24c611bdce9e82e7.tar.gz | |
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')
| -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 0427e7c..089a7c3f 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) pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); + pci_save_state(pdev); err = pci_enable_device_mem(pdev); if (err) { @@ -6010,6 +6011,7 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev) } else { pci_set_master(pdev); pci_restore_state(pdev); + pci_save_state(pdev); pci_enable_wake(pdev, PCI_D3hot, 0); pci_enable_wake(pdev, PCI_D3cold, 0); |
