X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=net%2Fdsa%2Fdsa.c;h=0c877a74e1f433699272953712458393045ff13c;hb=021db8e2bde53024a163fb4417a185de46fe77aa;hp=6112a12578b26441c69038aaffa1cf90bd2f9b91;hpb=d3b383338f105f50724c10a7d81b04a3930e886b;p=cascardo%2Flinux.git

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 6112a12578b2..0c877a74e1f4 100644
--- 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];