[RESEND][PATCH net-drivers-2.4 9/16] e1000: stops working after resume (fwd)

[Malli Chilakala <mallikarjuna.chilakala@xxxxxxxxx>]

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@xxxxxxxxx>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@xxxxxxxxx>
Signed-off-by: John Ronciak <john.ronciak@xxxxxxxxx>

diff -up net-drivers-2.4/drivers/net/e1000/e1000_main.c 
net-drivers-2.4/drivers/net/e1000.new/e1000_main.c
--- net-drivers-2.4/drivers/net/e1000/e1000_main.c      2005-04-12 
23:00:53.000000000 -0700
+++ net-drivers-2.4/drivers/net/e1000.new/e1000_main.c  2005-04-12 
23:00:55.000000000 -0700
@@ -3128,9 +3128,10 @@ e1000_resume(struct pci_dev *pdev)
        struct e1000_adapter *adapter = netdev->priv;
        uint32_t manc, ret;
 
-       ret = pci_enable_device(pdev);
        pci_set_power_state(pdev, 0);
        pci_restore_state(pdev, adapter->pci_state);
+       ret = pci_enable_device(pdev);
+       pci_set_master(pdev);
 
        pci_enable_wake(pdev, 3, 0);
        pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */