summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/ivtv/ivtv-vbi.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-08-20 11:10:31 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-08-20 11:10:31 -0300
commit638acf07e1921e20c61cd6fa47effac3dd17960b (patch)
tree25d9ef804621434a97f1c710f8013b64713712f5 /linux/drivers/media/video/ivtv/ivtv-vbi.c
parent231c6131d555f40b849f0e7332b9f90a2568145a (diff)
parente9f3de679c696aca2da479114ffac7389e0196e1 (diff)
downloadmediapointer-dvb-s2-638acf07e1921e20c61cd6fa47effac3dd17960b.tar.gz
mediapointer-dvb-s2-638acf07e1921e20c61cd6fa47effac3dd17960b.tar.bz2
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-vbi.c')
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-vbi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-vbi.c b/linux/drivers/media/video/ivtv/ivtv-vbi.c
index a7282a91b..a58c833c2 100644
--- a/linux/drivers/media/video/ivtv/ivtv-vbi.c
+++ b/linux/drivers/media/video/ivtv/ivtv-vbi.c
@@ -163,8 +163,8 @@ static int ivtv_convert_ivtv_vbi(struct ivtv *itv, u8 *p)
linemask[1] = 0xf;
p += 4;
} else {
- /* unknown VBI data stream */
- return 0;
+ /* unknown VBI data, convert to empty VBI frame */
+ linemask[0] = linemask[1] = 0;
}
for (i = 0; i < 36; i++) {
int err = 0;