projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'edac-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
[cascardo/linux.git]
/
drivers
/
net
/
ibm_newemac
/
core.c
diff --git
a/drivers/net/ibm_newemac/core.c
b/drivers/net/ibm_newemac/core.c
index
06bb9b7
..
8f11d29
100644
(file)
--- a/
drivers/net/ibm_newemac/core.c
+++ b/
drivers/net/ibm_newemac/core.c
@@
-2950,7
+2950,7
@@
static int __devexit emac_remove(struct platform_device *ofdev)
unregister_netdev(dev->ndev);
-
flush_scheduled_work(
);
+
cancel_work_sync(&dev->reset_work
);
if (emac_has_feature(dev, EMAC_FTR_HAS_TAH))
tah_detach(dev->tah_dev, dev->tah_port);