summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Walls2010-03-07 01:08:35 +0100
committerMauro Carvalho Chehab2010-05-18 05:46:43 +0200
commit283328c29db4463c31ee59f9ab418449cfa376b3 (patch)
tree4221ff93242abfc17b34da4224234c8189c76bdb
parentV4L/DVB: configurable IRQ from CAM (diff)
downloadkernel-qcow2-linux-283328c29db4463c31ee59f9ab418449cfa376b3.tar.gz
kernel-qcow2-linux-283328c29db4463c31ee59f9ab418449cfa376b3.tar.xz
kernel-qcow2-linux-283328c29db4463c31ee59f9ab418449cfa376b3.zip
V4L/DVB: ivtv: Combine capture start delays into a single delay
Combine the two 150 ms delays into a single 300 ms delay. Ian Armstrong has noted that the delay between CX2341X_ENC_INITIALIZE_INPUT and CX2341X_ENC_START_CAPTURE can cause problems if the temporal filter is allowed to be enabled. Signed-off-by: Andy Walls <awalls@radix.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/ivtv/ivtv-streams.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index 1f9387f6ca24..a994b0adb444 100644
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -581,10 +581,9 @@ int ivtv_start_v4l2_encode_stream(struct ivtv_stream *s)
v4l2_subdev_call(itv->sd_audio, audio, s_stream, 1);
/* Avoid unpredictable PCI bus hang - disable video clocks */
v4l2_subdev_call(itv->sd_video, video, s_stream, 0);
- ivtv_msleep_timeout(150, 1);
+ ivtv_msleep_timeout(300, 1);
ivtv_vapi(itv, CX2341X_ENC_INITIALIZE_INPUT, 0);
v4l2_subdev_call(itv->sd_video, video, s_stream, 1);
- ivtv_msleep_timeout(150, 1);
}
/* begin_capture */