e1000: call pci_save_state after pci_restore_state
authorNick Nunley <nicholasx.d.nunley@intel.com>
Wed, 3 Feb 2010 14:49:48 +0000 (14:49 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 4 Feb 2010 03:39:57 +0000 (19:39 -0800)
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: 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>
drivers/net/e1000/e1000_main.c

index 4ff50d6fe5e4b2a42d604aba0404366d8c11d97a..3b14dd718ab48f63a0a6c0fe47dbdc52bf177c36 100644 (file)
@@ -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);