bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed driver unloading in e1000 for 2.6.29.

This commit is contained in:
Florian Pose 2011-11-23 15:07:42 +01:00
parent d396f6fe26
commit 3eb1e91468
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devices/e1000/e1000_main-2.6.29-ethercat.c
View File

@ -1315,7 +1315,12 @@ static void __devexit e1000_remove(struct pci_dev *pdev)
* would have already happened in close and is redundant. */
e1000_release_hw_control(adapter);
unregister_netdev(netdev);
if (adapter->ecdev) {
ecdev_close(adapter->ecdev);
ecdev_withdraw(adapter->ecdev);
} else {
unregister_netdev(netdev);
}
if (!e1000_check_phy_reset_block(hw))
e1000_phy_hw_reset(hw);