Commit 88966993 authored by Ganesh Venkatesan's avatar Ganesh Venkatesan Committed by Jeff Garzik

[PATCH] e1000 - suspend/resume fix from alex@zodiac.dasalias.org

parent d1139eaf
...@@ -2901,6 +2901,8 @@ e1000_suspend(struct pci_dev *pdev, uint32_t state) ...@@ -2901,6 +2901,8 @@ e1000_suspend(struct pci_dev *pdev, uint32_t state)
} }
} }
pci_disable_device(pdev);
state = (state > 0) ? 3 : 0; state = (state > 0) ? 3 : 0;
pci_set_power_state(pdev, state); pci_set_power_state(pdev, state);
...@@ -2915,6 +2917,7 @@ e1000_resume(struct pci_dev *pdev) ...@@ -2915,6 +2917,7 @@ e1000_resume(struct pci_dev *pdev)
struct e1000_adapter *adapter = netdev->priv; struct e1000_adapter *adapter = netdev->priv;
uint32_t manc; uint32_t manc;
pci_enable_device(pdev);
pci_set_power_state(pdev, 0); pci_set_power_state(pdev, 0);
pci_restore_state(pdev, adapter->pci_state); pci_restore_state(pdev, adapter->pci_state);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment