Gitweb:     http://git.kernel.org/linus/283328c29db4463c31ee59f9ab418449cfa376b3
Commit:     283328c29db4463c31ee59f9ab418449cfa376b3
Parent:     2a8f96085449f3aa6fe99b27d7ee506e808059b9
Author:     Andy Walls <awalls@radix.net>
AuthorDate: Sat Mar 6 21:08:35 2010 -0300
Committer:  Mauro Carvalho Chehab <mchehab@redhat.com>
CommitDate: Tue May 18 00:46:43 2010 -0300

    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>
---
 drivers/media/video/ivtv/ivtv-streams.c |    3 +--
 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 1f9387f..a994b0a 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 */
--

[ message continues ]