提交 0d26aa70 编写于 作者: T Tejun Heo

mISDN: don't use flush_scheduled_work()

flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush ch->workq when freeing channel and cancel it on
release.
Signed-off-by: NTejun Heo <tj@kernel.org>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: netdev@vger.kernel.org
上级 d9c612eb
...@@ -110,7 +110,7 @@ mISDN_freedchannel(struct dchannel *ch) ...@@ -110,7 +110,7 @@ mISDN_freedchannel(struct dchannel *ch)
} }
skb_queue_purge(&ch->squeue); skb_queue_purge(&ch->squeue);
skb_queue_purge(&ch->rqueue); skb_queue_purge(&ch->rqueue);
flush_scheduled_work(); flush_work_sync(&ch->workq);
return 0; return 0;
} }
EXPORT_SYMBOL(mISDN_freedchannel); EXPORT_SYMBOL(mISDN_freedchannel);
...@@ -143,7 +143,7 @@ mISDN_freebchannel(struct bchannel *ch) ...@@ -143,7 +143,7 @@ mISDN_freebchannel(struct bchannel *ch)
mISDN_clear_bchannel(ch); mISDN_clear_bchannel(ch);
skb_queue_purge(&ch->rqueue); skb_queue_purge(&ch->rqueue);
ch->rcount = 0; ch->rcount = 0;
flush_scheduled_work(); flush_work_sync(&ch->workq);
return 0; return 0;
} }
EXPORT_SYMBOL(mISDN_freebchannel); EXPORT_SYMBOL(mISDN_freebchannel);
......
...@@ -1269,6 +1269,8 @@ release_card(struct l1oip *hc) ...@@ -1269,6 +1269,8 @@ release_card(struct l1oip *hc)
if (timer_pending(&hc->timeout_tl)) if (timer_pending(&hc->timeout_tl))
del_timer(&hc->timeout_tl); del_timer(&hc->timeout_tl);
cancel_work_sync(&hc->workq);
if (hc->socket_thread) if (hc->socket_thread)
l1oip_socket_close(hc); l1oip_socket_close(hc);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册