]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
[media] v4l2-ioctl: WARN_ON if querycap didn't fill device_caps
authorHans Verkuil <hverkuil@xs4all.nl>
Sun, 7 Dec 2014 14:59:42 +0000 (11:59 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Wed, 17 Dec 2014 01:21:39 +0000 (23:21 -0200)
This is easy to forget to do in drivers. While v4l2-compliance will check for it,
not everyone remembers to run it. So warn about it.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/v4l2-core/v4l2-ioctl.c

index 75658717961f4ac6603890ab785d444cfe864c3d..faac2f4e0f3ad358699a55123ebe18b38e8f65f5 100644 (file)
@@ -1017,6 +1017,12 @@ static int v4l_querycap(const struct v4l2_ioctl_ops *ops,
        ret = ops->vidioc_querycap(file, fh, cap);
 
        cap->capabilities |= V4L2_CAP_EXT_PIX_FORMAT;
+       /*
+        * Drivers MUST fill in device_caps, so check for this and
+        * warn if it was forgotten.
+        */
+       WARN_ON(!(cap->capabilities & V4L2_CAP_DEVICE_CAPS) ||
+               !cap->device_caps);
        cap->device_caps |= V4L2_CAP_EXT_PIX_FORMAT;
 
        return ret;