Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbb5aaeb authored by Nick Nunley's avatar Nick Nunley Committed by David S. Miller
Browse files

e1000: call pci_save_state after pci_restore_state 



This patch adds a call to pci_save_state() immediately after
the call 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: default avatarNicholas Nunley <nicholasx.d.nunley@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b548192a

drivers/net/e1000/e1000_main.c

+4 −0
Original line number Diff line number Diff line
@@ -847,6 +847,9 @@ static int __devinit e1000_probe(struct pci_dev *pdev, 
		goto err_pci_reg;



	pci_set_master(pdev);

	err = pci_save_state(pdev);

	if (err)

		goto err_alloc_etherdev;



	err = -ENOMEM;

	netdev = alloc_etherdev(sizeof(struct e1000_adapter));
@@ -4596,6 +4599,7 @@ static int e1000_resume(struct pci_dev *pdev) 


	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);

	pci_save_state(pdev);



	if (adapter->need_ioport)

		err = pci_enable_device(pdev);