This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/cgit.cgi/media_tree.git tree:

Subject: [media] saa7164: fix querycap warning
Author:  Hans Verkuil <[email protected]>
Date:    Fri Mar 27 15:17:56 2015 -0300

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 <[email protected]>
Cc: <[email protected]>      # for v3.19 and up
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 drivers/media/pci/saa7164/saa7164-encoder.c |   11 ++++++-----
 drivers/media/pci/saa7164/saa7164-vbi.c     |   11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

---

http://git.linuxtv.org/cgit.cgi/media_tree.git/commit/?id=534bc3e2ee93835badca753bedce8073c67caa92

diff --git a/drivers/media/pci/saa7164/saa7164-encoder.c 
b/drivers/media/pci/saa7164/saa7164-encoder.c
index 1ceed0c..4434e0f 100644
--- 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 56b33fd..859fd03 100644
--- 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;
 }

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to