[resend][PATCH net-drivers-2.6 9/16] e1000: e1000 stops working after resume

[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.6/drivers/net/e1000/e1000_main.c 
net-drivers-2.6/drivers/net/e1000.new/e1000_main.c
--- net-drivers-2.6/drivers/net/e1000/e1000_main.c      2005-04-11 
02:22:27.000000000 -0700
+++ net-drivers-2.6/drivers/net/e1000.new/e1000_main.c  2005-04-11 
02:22:29.000000000 -0700
@@ -3172,9 +3172,8 @@ 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);
+       ret = pci_enable_device(pdev);
+       pci_set_master(pdev);
 
        pci_enable_wake(pdev, 3, 0);
        pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */