diff options
| author | Alex Gonzalez <alex.gonzalez@digi.com> | 2011-10-25 14:30:37 +0200 |
|---|---|---|
| committer | Alex Gonzalez <alex.gonzalez@digi.com> | 2011-10-25 16:56:05 +0200 |
| commit | 8239f862adc8c7159704e16705cd1d214fa25225 (patch) | |
| tree | 2ef597394985872c2c75513177eca1b45778dae1 /drivers/media | |
| parent | 7dedcadd8b03c973cd71d6cffa536a0b1bdfd60d (diff) | |
MXC V4L2 capture: Increase timeout to wait for ready_q.
When using fbdevsink, the application needs more time to provide buffers.
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/mxc/capture/mxc_v4l2_capture.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/mxc/output/mxc_v4l2_output.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c index e5ad5493565a..4e202603f103 100644 --- a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c +++ b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c @@ -372,7 +372,7 @@ static int mxc_streamon(cam_data *cam) } if (list_empty(&cam->ready_q)) { - ret = wait_event_interruptible_timeout( cam->ready_queue , !list_empty(&cam->ready_q) , msecs_to_jiffies( 100 ) ); + ret = wait_event_interruptible_timeout( cam->ready_queue , !list_empty(&cam->ready_q) , msecs_to_jiffies(1000)); if( ret <= 0 ) pr_warning("Timeout waiting on ready queue\n"); } diff --git a/drivers/media/video/mxc/output/mxc_v4l2_output.c b/drivers/media/video/mxc/output/mxc_v4l2_output.c index e6ae7be351ea..5d84dd59005b 100644 --- a/drivers/media/video/mxc/output/mxc_v4l2_output.c +++ b/drivers/media/video/mxc/output/mxc_v4l2_output.c @@ -1262,9 +1262,9 @@ static int mxc_v4l2out_streamon(vout_data *vout) return 0; if ( queue_size(&vout->ready_q) < 2) { - ret = wait_event_interruptible( vout->ready_queue , queue_size(&vout->ready_q) >= 2 ); - if( ret < 0 ) - pr_warning("Timeout waiting on ready queue\n"); + ret = wait_event_interruptible_timeout( vout->ready_queue , queue_size(&vout->ready_q) >= 2 , msecs_to_jiffies(1000)); + if( ret <= 0 ) + pr_warning("mxc_v4l2out_streamon: Timeout waiting on ready queue\n"); } if (queue_size(&vout->ready_q) < 2) { |