From bb27aeae139b545b3cc81b6b62a2b5d61b6f71e9 Mon Sep 17 00:00:00 2001 From: Andy Walls Date: Sat, 6 Mar 2010 21:08:35 -0300 Subject: [PATCH] --- yaml --- r: 192774 b: refs/heads/master c: 283328c29db4463c31ee59f9ab418449cfa376b3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtv-streams.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fc681b83c0ce..47db702fbf19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a8f96085449f3aa6fe99b27d7ee506e808059b9 +refs/heads/master: 283328c29db4463c31ee59f9ab418449cfa376b3 diff --git a/trunk/drivers/media/video/ivtv/ivtv-streams.c b/trunk/drivers/media/video/ivtv/ivtv-streams.c index 1f9387f6ca24..a994b0adb444 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-streams.c +++ b/trunk/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 */