[media] saa7164: fix querycap warning

Fix the VIDIOC_QUERYCAP warning due to the missing device_caps. Don't fill
in the version field, the V4L2 core will do that for you.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: <stable@vger.kernel.org>      # for v3.19 and up
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/pci/saa7164/saa7164-encoder.c b/drivers/media/pci/saa7164/saa7164-encoder.c
index 1ceed0cdced06dec0a7d0984f67bd049a2859471..4434e0f28c26f34120a82ea080cf00fa84100d9c 100644 (file)
--- a/drivers/media/pci/saa7164/saa7164-encoder.c
+++ b/drivers/media/pci/saa7164/saa7164-encoder.c
@@ -721,13 +721,14 @@ static int vidioc_querycap(struct file *file, void  *priv,
                sizeof(cap->card));
        sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
 
-       cap->capabilities =
+       cap->device_caps =
                V4L2_CAP_VIDEO_CAPTURE |
-               V4L2_CAP_READWRITE     |
-               0;
+               V4L2_CAP_READWRITE |
+               V4L2_CAP_TUNER;
 
-       cap->capabilities |= V4L2_CAP_TUNER;
-       cap->version = 0;
+       cap->capabilities = cap->device_caps |
+               V4L2_CAP_VBI_CAPTURE |
+               V4L2_CAP_DEVICE_CAPS;
 
        return 0;
 }

diff --git a/drivers/media/pci/saa7164/saa7164-vbi.c b/drivers/media/pci/saa7164/saa7164-vbi.c
index 56b33fd65328f123c5ed7d1dbcbba2b3c3a08792..859fd03d82f93f4c0c5893f4b541cd665ac0b65a 100644 (file)
--- a/drivers/media/pci/saa7164/saa7164-vbi.c
+++ b/drivers/media/pci/saa7164/saa7164-vbi.c
@@ -660,13 +660,14 @@ static int vidioc_querycap(struct file *file, void  *priv,
                sizeof(cap->card));
        sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
 
-       cap->capabilities =
+       cap->device_caps =
                V4L2_CAP_VBI_CAPTURE |
-               V4L2_CAP_READWRITE     |
-               0;
+               V4L2_CAP_READWRITE |
+               V4L2_CAP_TUNER;
 
-       cap->capabilities |= V4L2_CAP_TUNER;
-       cap->version = 0;
+       cap->capabilities = cap->device_caps |
+               V4L2_CAP_VIDEO_CAPTURE |
+               V4L2_CAP_DEVICE_CAPS;
 
        return 0;
 }