diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-18 20:16:00 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-10 03:05:36 +0200 |
| commit | 51a99c0428cc6d3a442eef1c9046099c9383d72b (patch) | |
| tree | 774d4456092221f25e40227796575fe74fced026 /drivers/media/video/ivtv/ivtv-vbi.c | |
| parent | V4L/DVB (6048): ivtv: fix stop stream locking (diff) | |
| download | linux-51a99c0428cc6d3a442eef1c9046099c9383d72b.tar.xz linux-51a99c0428cc6d3a442eef1c9046099c9383d72b.zip | |
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.c | 4 |
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) 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; |