summaryrefslogtreecommitdiff
path: root/drivers/media/video/vivi.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2012-01-24 08:24:36 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-01-26 17:35:54 (GMT)
commit23268ae5f0447316101ff320ac89d5ee8a0b5f70 (patch)
treef18f3da997a71c28993f4034664fcbf0f34621ea /drivers/media/video/vivi.c
parente4b444369c75604ef6e656969039b1c6b4ca61c5 (diff)
downloadlinux-23268ae5f0447316101ff320ac89d5ee8a0b5f70.tar.xz
[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 <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/vivi.c')
-rw-r--r--drivers/media/video/vivi.c6
1 files changed, 3 insertions, 3 deletions
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;
}