diff options
author | Tejun Heo <tj@kernel.org> | 2010-12-24 09:59:07 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2010-12-24 09:59:07 -0500 |
commit | 0d26aa704e5bbca5a1ee9fdf0d02277ceb507eee (patch) | |
tree | eaaa369f6ef51d9cdf182c44621b5f7da9987849 /drivers/isdn/mISDN/l1oip_core.c | |
parent | d9c612eb6e9ccb8192e6c4d609dbbf178020c672 (diff) |
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
Diffstat (limited to 'drivers/isdn/mISDN/l1oip_core.c')
-rw-r--r-- | drivers/isdn/mISDN/l1oip_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) | |||
1269 | if (timer_pending(&hc->timeout_tl)) | 1269 | if (timer_pending(&hc->timeout_tl)) |
1270 | del_timer(&hc->timeout_tl); | 1270 | del_timer(&hc->timeout_tl); |
1271 | 1271 | ||
1272 | cancel_work_sync(&hc->workq); | ||
1273 | |||
1272 | if (hc->socket_thread) | 1274 | if (hc->socket_thread) |
1273 | l1oip_socket_close(hc); | 1275 | l1oip_socket_close(hc); |
1274 | 1276 | ||