aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarton Balint <cus@fazekas.hu>2010-02-24 11:23:36 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-17 23:46:23 -0400
commitd044189dfea1e8329d63cb4e18815a7e92d2e049 (patch)
tree719ed7684fa4077216fc4239fc65db9b0b2677b9
parentb628a2a3d4e97044cc9f6818bfb8330d8d0b021a (diff)
V4L/DVB: cx88: increase BUFFER_TIMEOUT to 2 seconds
When temporarily there is no video signal, sometimes it takes more than 0.5 secs for the cx88 chip to generate a single frame. If a dma timeout occurs during recording, it confuses the recording application (at least mencoder) and the recording stops. Since there is already an #if 0 for 2 seconds buffer timeout in the code at the -hg development tree, re-enabling that seemed the most simple solution. Signed-off-by: Marton Balint <cus@fazekas.hu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/cx88/cx88.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 48b6c04fb497..b5f054d124f1 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -290,7 +290,7 @@ struct cx88_subid {
290#define RESOURCE_VIDEO 2 290#define RESOURCE_VIDEO 2
291#define RESOURCE_VBI 4 291#define RESOURCE_VBI 4
292 292
293#define BUFFER_TIMEOUT msecs_to_jiffies(500) /* 0.5 seconds */ 293#define BUFFER_TIMEOUT msecs_to_jiffies(2000)
294 294
295/* buffer for one video frame */ 295/* buffer for one video frame */
296struct cx88_buffer { 296struct cx88_buffer {