aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
-rw-r--r--drivers/net/e1000/e1000_main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 4ff50d6fe5e4..3b14dd718ab4 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -847,6 +847,9 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
847 goto err_pci_reg; 847 goto err_pci_reg;
848 848
849 pci_set_master(pdev); 849 pci_set_master(pdev);
850 err = pci_save_state(pdev);
851 if (err)
852 goto err_alloc_etherdev;
850 853
851 err = -ENOMEM; 854 err = -ENOMEM;
852 netdev = alloc_etherdev(sizeof(struct e1000_adapter)); 855 netdev = alloc_etherdev(sizeof(struct e1000_adapter));
@@ -4596,6 +4599,7 @@ static int e1000_resume(struct pci_dev *pdev)
4596 4599
4597 pci_set_power_state(pdev, PCI_D0); 4600 pci_set_power_state(pdev, PCI_D0);
4598 pci_restore_state(pdev); 4601 pci_restore_state(pdev);
4602 pci_save_state(pdev);
4599 4603
4600 if (adapter->need_ioport) 4604 if (adapter->need_ioport)
4601 err = pci_enable_device(pdev); 4605 err = pci_enable_device(pdev);