diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-24 17:59:07 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-24 17:59:07 +0300 |
| commit | 0d26aa704e5bbca5a1ee9fdf0d02277ceb507eee (patch) | |
| tree | eaaa369f6ef51d9cdf182c44621b5f7da9987849 | |
| parent | d9c612eb6e9ccb8192e6c4d609dbbf178020c672 (diff) | |
| download | linux-0d26aa704e5bbca5a1ee9fdf0d02277ceb507eee.tar.xz | |
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: Tejun Heo <tj@kernel.org>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: netdev@vger.kernel.org
| -rw-r--r-- | drivers/isdn/mISDN/hwchannel.c | 4 | ||||
| -rw-r--r-- | drivers/isdn/mISDN/l1oip_core.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/isdn/mISDN/hwchannel.c b/drivers/isdn/mISDN/hwchannel.c index 307bd6e8988b..199f374cf9da 100644 --- a/drivers/isdn/mISDN/hwchannel.c +++ b/drivers/isdn/mISDN/hwchannel.c @@ -110,7 +110,7 @@ mISDN_freedchannel(struct dchannel *ch) } skb_queue_purge(&ch->squeue); skb_queue_purge(&ch->rqueue); - flush_scheduled_work(); + flush_work_sync(&ch->workq); return 0; } EXPORT_SYMBOL(mISDN_freedchannel); @@ -143,7 +143,7 @@ mISDN_freebchannel(struct bchannel *ch) mISDN_clear_bchannel(ch); skb_queue_purge(&ch->rqueue); ch->rcount = 0; - flush_scheduled_work(); + flush_work_sync(&ch->workq); return 0; } EXPORT_SYMBOL(mISDN_freebchannel); diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index 5b59796ed250..bd526f664a39 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c @@ -1269,6 +1269,8 @@ release_card(struct l1oip *hc) if (timer_pending(&hc->timeout_tl)) del_timer(&hc->timeout_tl); + cancel_work_sync(&hc->workq); + if (hc->socket_thread) l1oip_socket_close(hc); |