devices/e1000/e1000_main-2.6.29-ethercat.c
changeset 2162 3f90ae16e997
parent 2072 4adb56c4198d
child 2163 d6d49dcaf7a5
equal deleted inserted replaced
2154:6a0296e7d1cd 2162:3f90ae16e997
  1313 
  1313 
  1314 	/* Release control of h/w to f/w.  If f/w is AMT enabled, this
  1314 	/* Release control of h/w to f/w.  If f/w is AMT enabled, this
  1315 	 * would have already happened in close and is redundant. */
  1315 	 * would have already happened in close and is redundant. */
  1316 	e1000_release_hw_control(adapter);
  1316 	e1000_release_hw_control(adapter);
  1317 
  1317 
  1318 	unregister_netdev(netdev);
  1318 	if (adapter->ecdev) {
       
  1319 		ecdev_close(adapter->ecdev);
       
  1320 		ecdev_withdraw(adapter->ecdev);
       
  1321 	} else {
       
  1322 		unregister_netdev(netdev);
       
  1323 	}
  1319 
  1324 
  1320 	if (!e1000_check_phy_reset_block(hw))
  1325 	if (!e1000_check_phy_reset_block(hw))
  1321 		e1000_phy_hw_reset(hw);
  1326 		e1000_phy_hw_reset(hw);
  1322 
  1327 
  1323 	kfree(adapter->tx_ring);
  1328 	kfree(adapter->tx_ring);