diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2010-01-07 17:30:56 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-08 09:35:29 +0100 |
| commit | 28b8f04a5256ca5ec0781b06ee9353c37c650980 (patch) | |
| tree | 4e8479adbbcd20cda5c519327d6040e61d241190 /drivers/net/e1000e | |
| parent | netxen: update version to 4.0.72 (diff) | |
| download | linux-28b8f04a5256ca5ec0781b06ee9353c37c650980.tar.xz linux-28b8f04a5256ca5ec0781b06ee9353c37c650980.zip | |
e1000e: call pci_save_state() after pci_restore_state()
Due to a change in pci_restore_state()[1] which clears the saved_state
flag, the driver should call pci_save_state() to set the flag once again
to avoid issues with EEH (same fix that recently was submitted for ixgbe).
[1] commmit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff
Signed-off-by: Bruce Allan <bruce.w.allan@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/e1000e')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 762b697ce731..10aa0ec719df 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -4674,6 +4674,7 @@ static int e1000_resume(struct pci_dev *pdev) pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); + pci_save_state(pdev); e1000e_disable_l1aspm(pdev); err = pci_enable_device_mem(pdev); @@ -4825,6 +4826,7 @@ static pci_ers_result_t e1000_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); |