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 'next-spi' of git://git.secretlab.ca/git/linux-2.6
[cascardo/linux.git]
/
net
/
dsa
/
dsa.c
diff --git
a/net/dsa/dsa.c
b/net/dsa/dsa.c
index
6112a12
..
0c877a7
100644
(file)
--- a/
net/dsa/dsa.c
+++ b/
net/dsa/dsa.c
@@
-390,7
+390,7
@@
static int dsa_remove(struct platform_device *pdev)
if (dst->link_poll_needed)
del_timer_sync(&dst->link_poll_timer);
- flush_
scheduled_work(
);
+ flush_
work_sync(&dst->link_poll_work
);
for (i = 0; i < dst->pd->nr_chips; i++) {
struct dsa_switch *ds = dst->ds[i];