V4L/DVB (9805): cx18: Port fix for raw/sliced VBI mixup from ivtv and cx25840

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.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c
index 61192e62a80f..1856d59e0cf6 100644
--- a/drivers/media/video/cx18/cx18-fileops.c
+++ b/drivers/media/video/cx18/cx18-fileops.c
@@ -67,12 +67,11 @@ static int cx18_claim_stream(struct cx18_open_id *id, int type)
         }
         s->id = id->open_id;
 
-        /* CX18_DEC_STREAM_TYPE_MPG needs to claim CX18_DEC_STREAM_TYPE_VBI,
-           CX18_ENC_STREAM_TYPE_MPG needs to claim CX18_ENC_STREAM_TYPE_VBI
+        /* CX18_ENC_STREAM_TYPE_MPG needs to claim CX18_ENC_STREAM_TYPE_VBI
            (provided VBI insertion is on and sliced VBI is selected), for all
            other streams we're done */
         if (type == CX18_ENC_STREAM_TYPE_MPG &&
-                   cx->vbi.insert_mpeg && cx->vbi.sliced_in->service_set) {
+            cx->vbi.insert_mpeg && !cx18_raw_vbi(cx)) {
                 vbi_type = CX18_ENC_STREAM_TYPE_VBI;
         } else {
                 return 0;
@@ -258,7 +257,7 @@ static size_t cx18_copy_buf_to_user(struct cx18_stream *s,
         if (len > ucount)
                 len = ucount;
         if (cx->vbi.insert_mpeg && s->type == CX18_ENC_STREAM_TYPE_MPG &&
-            cx->vbi.sliced_in->service_set && buf != &cx->vbi.sliced_mpeg_buf) {
+            !cx18_raw_vbi(cx) && buf != &cx->vbi.sliced_mpeg_buf) {
                 const char *start = buf->buf + buf->readpos;
                 const char *p = start + 1;
                 const u8 *q;
@@ -333,8 +332,7 @@ static ssize_t cx18_read(struct cx18_stream *s, char __user *ubuf,
         /* Each VBI buffer is one frame, the v4l2 API says that for VBI the
            frames should arrive one-by-one, so make sure we never output more
            than one VBI frame at a time */
-        if (s->type == CX18_ENC_STREAM_TYPE_VBI &&
-            cx->vbi.sliced_in->service_set)
+        if (s->type == CX18_ENC_STREAM_TYPE_VBI && !cx18_raw_vbi(cx))
                 single_frame = 1;
 
         for (;;) {