summaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorMalli Chilakala <mallikarjuna.chilakala@intel.com>2005-04-28 19:41:28 -0700
committerJeff Garzik <jgarzik@pobox.com>2005-05-12 20:48:53 -0400
commita4cb847dac40577dd751a4deb4085ed080780679 (patch)
tree673dcbdd4bd65d32b9181ad61779b0788b36e8de /drivers/net/e1000
parent6d9157577d926d2a83fe8d4914c0cc216deb5842 (diff)
downloadop-kernel-dev-a4cb847dac40577dd751a4deb4085ed080780679.zip
op-kernel-dev-a4cb847dac40577dd751a4deb4085ed080780679.tar.gz
[PATCH] e1000: e1000 stops working after resume
e1000 stops working after resume, call pci_enable_device after pci_restore_state - Modified Andrew Morton's patch Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index ed1e57a..479915a 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3173,8 +3173,7 @@ e1000_resume(struct pci_dev *pdev)
pci_set_power_state(pdev, 0);
pci_restore_state(pdev);
ret = pci_enable_device(pdev);
- if (pdev->is_busmaster)
- pci_set_master(pdev);
+ pci_set_master(pdev);
pci_enable_wake(pdev, 3, 0);
pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
OpenPOWER on IntegriCloud