Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[mv-sheeva.git] / drivers / media / video / cx23885 / cx23885-input.c

diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c
index 0b0d0664382ae07c6c3a2504decaab3808ea215a..199b9964bbe5ab27776b9dd2f9d2d59dd96c9a2b 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-input.c
+++ b/drivers/media/video/cx23885/cx23885-input.c
@@ -229,8 +229,6 @@ static void cx23885_input_ir_stop(struct cx23885_dev *dev)
                v4l2_subdev_call(dev->sd_ir, ir, rx_s_parameters, &params);
                v4l2_subdev_call(dev->sd_ir, ir, rx_g_parameters, &params);
        }
-
-       flush_scheduled_work();
 }
 
 static void cx23885_input_ir_close(struct rc_dev *rc)