From: Hans Verkuil Date: Tue, 24 Jan 2012 08:24:36 +0000 (-0300) Subject: [media] vivi: don't set V4L2_CAP_DEVICE_CAPS for the device_caps field X-Git-Tag: v3.5-rc5~26^2~782 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=23268ae5f0447316101ff320ac89d5ee8a0b5f70;p=platform%2Fkernel%2Flinux-stable.git [media] vivi: don't set V4L2_CAP_DEVICE_CAPS for the device_caps field V4L2_CAP_DEVICE_CAPS is valid for the capabilities field only as per the spec. Found with v4l2-compliance. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 84ea88d..5578c19 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c @@ -819,9 +819,9 @@ static int vidioc_querycap(struct file *file, void *priv, strcpy(cap->driver, "vivi"); strcpy(cap->card, "vivi"); strlcpy(cap->bus_info, dev->v4l2_dev.name, sizeof(cap->bus_info)); - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | - V4L2_CAP_READWRITE | V4L2_CAP_DEVICE_CAPS; - cap->device_caps = cap->capabilities; + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | + V4L2_CAP_READWRITE; + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; return 0; }