From: Marton Balint Date: Wed, 24 Feb 2010 16:23:36 +0000 (-0300) Subject: V4L/DVB: cx88: increase BUFFER_TIMEOUT to 2 seconds X-Git-Tag: v2.6.35-rc1~480^2~416 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=d044189dfea1e8329d63cb4e18815a7e92d2e049;p=safe%2Fjmp%2Flinux-2.6 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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index 48b6c04..b5f054d 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h @@ -290,7 +290,7 @@ struct cx88_subid { #define RESOURCE_VIDEO 2 #define RESOURCE_VBI 4 -#define BUFFER_TIMEOUT msecs_to_jiffies(500) /* 0.5 seconds */ +#define BUFFER_TIMEOUT msecs_to_jiffies(2000) /* buffer for one video frame */ struct cx88_buffer {