From a91dfa3649463defd63aa77cb2c9eb3ff063aa65 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Tue, 15 Feb 2011 06:20:12 -0300 Subject: [PATCH] --- yaml --- r: 261195 b: refs/heads/master c: 4bbcd849b07259211dfe6d3168e669e89bbd19ea h: refs/heads/master i: 261193: 971b1bcbec88251d5d7c112f782adf332a62186e 261191: df1fdd61e9ff0321e1fa44b6a4afab35385020b7 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx23885/cx23885-input.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e5e8f37cf6ea..fc998adb6983 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 061d55eb450102408289599ae79b92322d6126e1 +refs/heads/master: 4bbcd849b07259211dfe6d3168e669e89bbd19ea diff --git a/trunk/drivers/media/video/cx23885/cx23885-input.c b/trunk/drivers/media/video/cx23885/cx23885-input.c index e97cafd83984..1ca6693cb5f8 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-input.c +++ b/trunk/drivers/media/video/cx23885/cx23885-input.c @@ -229,6 +229,9 @@ 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_work_sync(&dev->cx25840_work); + flush_work_sync(&dev->ir_rx_work); + flush_work_sync(&dev->ir_tx_work); } static void cx23885_input_ir_close(struct rc_dev *rc)