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, &params);
 		v4l2_subdev_call(dev->sd_ir, ir, rx_g_parameters, &params);
 	}
+	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)