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

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

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: 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 88a268c1

drivers/net/igb/igb_main.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -5885,6 +5885,7 @@ static int igb_resume(struct pci_dev *pdev) 




	pci_set_power_state(pdev, PCI_D0);

	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);

	pci_restore_state(pdev);

	pci_save_state(pdev);





	err = pci_enable_device_mem(pdev);

	err = pci_enable_device_mem(pdev);

	if (err) {

	if (err) {
@@ -6010,6 +6011,7 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev) 
	} else {

	} else {

		pci_set_master(pdev);

		pci_set_master(pdev);

		pci_restore_state(pdev);

		pci_restore_state(pdev);

		pci_save_state(pdev);





		pci_enable_wake(pdev, PCI_D3hot, 0);

		pci_enable_wake(pdev, PCI_D3hot, 0);

		pci_enable_wake(pdev, PCI_D3cold, 0);

		pci_enable_wake(pdev, PCI_D3cold, 0);