Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index a1a6c08e7dcf..f1c01ac29102 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -660,6 +660,7 @@ static int ne2k_pci_suspend (struct pci_dev *pdev, pm_message_t state)
 
         netif_device_detach(dev);
         pci_save_state(pdev);
+        pci_disable_device(pdev);
         pci_set_power_state(pdev, pci_choose_state(pdev, state));
 
         return 0;
@@ -671,6 +672,8 @@ static int ne2k_pci_resume (struct pci_dev *pdev)
 
         pci_set_power_state(pdev, 0);
         pci_restore_state(pdev);
+        pci_enable_device(pdev);
+        pci_set_master(pdev);
         NS8390_init(dev, 1);
         netif_device_attach(dev);