diff options
author | Tejun Heo <tj@kernel.org> | 2010-12-24 16:14:20 +0100 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2010-12-24 16:14:20 +0100 |
commit | 8c71778cbf2c8beaefaa2dee5478aa0622d96682 (patch) | |
tree | 706fbdc96f696454d96538834b0d459967232e91 /drivers/media/video/cx23885 | |
parent | 707bcf326bd50c875d82bd2e7c31dcfb92b7e813 (diff) | |
download | linux-stable-8c71778cbf2c8beaefaa2dee5478aa0622d96682.tar.gz linux-stable-8c71778cbf2c8beaefaa2dee5478aa0622d96682.tar.bz2 linux-stable-8c71778cbf2c8beaefaa2dee5478aa0622d96682.zip |
media/video: don't use flush_scheduled_work()
This patch converts the remaining users of flush_scheduled_work() in
media/video.
* bttv-input.c and cx23885-input.c don't use workqueue at all. No
need to flush.
* Make omap24xxcam.c and saa7134-empress.c flush the used work
directly.
* In fd_defio.c, replace cancel_delayed_work() +
flush_scheduled_work() with cancel_delayed_work_sync(). While at
it, replace the deprecated cancel_rearming_delayed_work() with
cancel_delayed_work_sync().
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx23885')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-input.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c index bb61870b8d6e..4a326fe0b01c 100644 --- a/drivers/media/video/cx23885/cx23885-input.c +++ b/drivers/media/video/cx23885/cx23885-input.c @@ -230,8 +230,6 @@ static void cx23885_input_ir_stop(struct cx23885_dev *dev) v4l2_subdev_call(dev->sd_ir, ir, rx_s_parameters, ¶ms); v4l2_subdev_call(dev->sd_ir, ir, rx_g_parameters, ¶ms); } - - flush_scheduled_work(); } static void cx23885_input_ir_close(void *priv) |