[media] av7110: fix v4l2_compliance test issues

Besides the usual inconsistencies in input enumeration there was also a
kernel crash if you tried to poll on a vbi node. The checks for sliced
vbi output vs vbi capture were not complete enough.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 6 insertions, 2 deletions

diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 428a543ec2ce..7d42c11c8684 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -309,6 +309,8 @@ static int fops_mmap(struct file *file, struct vm_area_struct * vma)
         case VFL_TYPE_VBI: {
                 DEB_EE("V4L2_BUF_TYPE_VBI_CAPTURE: file:%p, vma:%p\n",
                        file, vma);
+                if (fh->dev->ext_vv_data->capabilities & V4L2_CAP_SLICED_VBI_OUTPUT)
+                        return -ENODEV;
                 q = &fh->vbi_q;
                 break;
                 }
@@ -331,6 +333,8 @@ static unsigned int fops_poll(struct file *file, struct poll_table_struct *wait)
         DEB_EE("file:%p, poll:%p\n", file, wait);
 
         if (vdev->vfl_type == VFL_TYPE_VBI) {
+                if (fh->dev->ext_vv_data->capabilities & V4L2_CAP_SLICED_VBI_OUTPUT)
+                        return res | POLLOUT | POLLWRNORM;
                 if( 0 == fh->vbi_q.streaming )
                         return res | videobuf_poll_stream(file, &fh->vbi_q, wait);
                 q = &fh->vbi_q;
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index 9d193208b892..6d14785d4747 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -458,13 +458,13 @@ static int vidioc_querycap(struct file *file, void *fh, struct v4l2_capability *
                 V4L2_CAP_READWRITE |
                 V4L2_CAP_STREAMING;
         cap->device_caps |= dev->ext_vv_data->capabilities;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         if (vdev->vfl_type == VFL_TYPE_GRABBER)
                 cap->device_caps &=
                         ~(V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_OUTPUT);
         else
                 cap->device_caps &=
-                        ~(V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OVERLAY);
-        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
+                        ~(V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OVERLAY | V4L2_CAP_AUDIO);
         return 0;
 }