X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=drivers%2Fnet%2Fbenet%2Fbe_main.c;h=45507d88e6a135d2106e3e2101038011f4e8dea9;hb=9b0365f1954b0b54a896171b4438ed42ad7ef02f;hp=2db879c03c6d66e7c274bfc3a72936b4f4c35c1d;hpb=c458bc50e31631f7e9333ea6f1832fc54d4e2c1e;p=net-next-2.6.git

diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 2db879c03c6..45507d88e6a 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -1972,9 +1972,9 @@ static int be_suspend(struct pci_dev *pdev, pm_message_t state)
 	if (netif_running(netdev)) {
 		rtnl_lock();
 		be_close(netdev);
-		be_clear(adapter);
 		rtnl_unlock();
 	}
+	be_clear(adapter);
 
 	pci_save_state(pdev);
 	pci_disable_device(pdev);
@@ -1997,9 +1997,9 @@ static int be_resume(struct pci_dev *pdev)
 	pci_set_power_state(pdev, 0);
 	pci_restore_state(pdev);
 
+	be_setup(adapter);
 	if (netif_running(netdev)) {
 		rtnl_lock();
-		be_setup(adapter);
 		be_open(netdev);
 		rtnl_unlock();
 	}