git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
drivers/net: don't use flush_scheduled_work()
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
mv643xx_eth.c
diff --git
a/drivers/net/mv643xx_eth.c
b/drivers/net/mv643xx_eth.c
index ce31e74a559bc4110ad4c82371adfcbcbc38b644..02076e16542a30b2a4e98e5debd667c53eea77e3 100644
(file)
--- a/
drivers/net/mv643xx_eth.c
+++ b/
drivers/net/mv643xx_eth.c
@@
-2978,7
+2978,7
@@
static int mv643xx_eth_remove(struct platform_device *pdev)
unregister_netdev(mp->dev);
if (mp->phy != NULL)
phy_detach(mp->phy);
-
flush_scheduled_work(
);
+
cancel_work_sync(&mp->tx_timeout_task
);
free_netdev(mp->dev);
platform_set_drvdata(pdev, NULL);