aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv/ivtv-vbi.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-08-18 14:16:00 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 21:05:36 -0400
commit51a99c0428cc6d3a442eef1c9046099c9383d72b (patch)
tree774d4456092221f25e40227796575fe74fced026 /drivers/media/video/ivtv/ivtv-vbi.c
parentde870b52be9d52c3dad76c9ea7399cb94abcaa1a (diff)
V4L/DVB (6049): ivtv: fix VBI reinsertion decoding
- Invalid VBI packets should result in an empty VBI frame, not in an zero-sized frame that causes the reader to incorrectly return a 0 (EOF) value. - PIO completion should not reset the sg_pending_size field. - The DMA offset detection code should be ignored for PIO transfers: it somehow messes up the data on the card and is not needed anyway for PIO. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-vbi.c')
-rw-r--r--drivers/media/video/ivtv/ivtv-vbi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-vbi.c b/drivers/media/video/ivtv/ivtv-vbi.c
index a7282a91bd97..a58c833c2b04 100644
--- a/drivers/media/video/ivtv/ivtv-vbi.c
+++ b/drivers/media/video/ivtv/ivtv-vbi.c
@@ -163,8 +163,8 @@ static int ivtv_convert_ivtv_vbi(struct ivtv *itv, u8 *p)
163 linemask[1] = 0xf; 163 linemask[1] = 0xf;
164 p += 4; 164 p += 4;
165 } else { 165 } else {
166 /* unknown VBI data stream */ 166 /* unknown VBI data, convert to empty VBI frame */
167 return 0; 167 linemask[0] = linemask[1] = 0;
168 } 168 }
169 for (i = 0; i < 36; i++) { 169 for (i = 0; i < 36; i++) {
170 int err = 0; 170 int err = 0;