diff options
author | Tejun Heo <tj@kernel.org> | 2010-12-24 15:00:17 (GMT) |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2010-12-24 15:00:17 (GMT) |
commit | 0d9c76aedbac3ad8ac4e99a2b441bc3f91dd6679 (patch) | |
tree | ed63d25f7034651be0afd7fbe046cfa464b7aece /drivers/media/dvb/dvb-core | |
parent | 99ef21216b4f85c56392ed41500d2f07f58cc360 (diff) | |
download | linux-fsl-qoriq-0d9c76aedbac3ad8ac4e99a2b441bc3f91dd6679.tar.xz |
dvb: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
* Flush the used works directly.
* Replace the deprecated cancel_rearming_delayed_work() +
flush_scheduled_work() -> cancel_delayed_work_sync().
* Make sure mantis->uart_work isn't running on exit.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: linux-media@vger.kernel.org
Diffstat (limited to 'drivers/media/dvb/dvb-core')
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_net.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c index 4df42aa..51752a9 100644 --- a/drivers/media/dvb/dvb-core/dvb_net.c +++ b/drivers/media/dvb/dvb-core/dvb_net.c @@ -1329,7 +1329,8 @@ static int dvb_net_remove_if(struct dvb_net *dvbnet, unsigned long num) return -EBUSY; dvb_net_stop(net); - flush_scheduled_work(); + flush_work_sync(&priv->set_multicast_list_wq); + flush_work_sync(&priv->restart_net_feed_wq); printk("dvb_net: removed network interface %s\n", net->name); unregister_netdev(net); dvbnet->state[num]=0; |