diff options
| author | Andy Walls <awalls@radix.net> | 2008-12-12 14:24:04 -0500 |
|---|---|---|
| committer | Andy Walls <awalls@radix.net> | 2008-12-12 14:24:04 -0500 |
| commit | 4b1de397a8c3dfe7e1f5e1b3165b70fb0193f099 (patch) | |
| tree | 8e116954ac10cd87612cce0e4b2d4d9f64b6f74c /linux/drivers/media/video/cx18/cx18-driver.c | |
| parent | a00ab36aaa26baf7d88c5763300d06dc47327148 (diff) | |
| download | mediapointer-dvb-s2-4b1de397a8c3dfe7e1f5e1b3165b70fb0193f099.tar.gz mediapointer-dvb-s2-4b1de397a8c3dfe7e1f5e1b3165b70fb0193f099.tar.bz2 | |
cx18: Port fix for raw/sliced VBI mixup from ivtv and cx25840
From: Andy Walls <awalls@radix.net>
This is a port of the fixes Hans Verkuil made for ivtv/cx25840:
The service_set field was used to determine whether raw or sliced VBI was
desired. This is incorrect since it is perfectly valid to select sliced VBI
with a service_set of 0.
Instead the driver should check on VIDIOC_S_FMT whether the type
field matches the raw or sliced VBI type.
Updated the cx18 driver accordingly, including an additional check in
cx18_start_v4l2_encode_stream() that didn't exist in ivtv.
Priority: normal
Signed-off-by: Andy Walls <awalls@radix.net>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-driver.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.c b/linux/drivers/media/video/cx18/cx18-driver.c index a358bcce2..6f1654945 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.c +++ b/linux/drivers/media/video/cx18/cx18-driver.c @@ -599,7 +599,7 @@ static int __devinit cx18_init_struct1(struct cx18 *cx) init_waitqueue_head(&cx->dma_waitq); /* VBI */ - cx->vbi.in.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE; + cx->vbi.in.type = V4L2_BUF_TYPE_VBI_CAPTURE; cx->vbi.sliced_in = &cx->vbi.in.fmt.sliced; cx->vbi.raw_size = 1456; cx->vbi.raw_decoder_line_size = 1456; |