diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-24 16:00:17 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-24 16:00:17 +0100 |
| commit | 0d9c76aedbac3ad8ac4e99a2b441bc3f91dd6679 (patch) | |
| tree | ed63d25f7034651be0afd7fbe046cfa464b7aece /drivers/media/dvb/dvb-usb/dvb-usb-remote.c | |
| parent | 99ef21216b4f85c56392ed41500d2f07f58cc360 (diff) | |
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-usb/dvb-usb-remote.c')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c index 0831469af69..d5f3d3c7463 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c +++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c @@ -299,7 +299,6 @@ int dvb_usb_remote_exit(struct dvb_usb_device *d) { if (d->state & DVB_USB_STATE_REMOTE) { cancel_delayed_work_sync(&d->rc_query_work); - flush_scheduled_work(); if (d->props.rc.mode == DVB_RC_LEGACY) input_unregister_device(d->rc_input_dev); else |