diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2012-01-24 03:24:36 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-26 12:35:54 -0500 |
commit | 23268ae5f0447316101ff320ac89d5ee8a0b5f70 (patch) | |
tree | f18f3da997a71c28993f4034664fcbf0f34621ea /drivers/media/video/vivi.c | |
parent | e4b444369c75604ef6e656969039b1c6b4ca61c5 (diff) |
[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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 84ea88dc10ad..5578c1953585 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, | |||
819 | strcpy(cap->driver, "vivi"); | 819 | strcpy(cap->driver, "vivi"); |
820 | strcpy(cap->card, "vivi"); | 820 | strcpy(cap->card, "vivi"); |
821 | strlcpy(cap->bus_info, dev->v4l2_dev.name, sizeof(cap->bus_info)); | 821 | strlcpy(cap->bus_info, dev->v4l2_dev.name, sizeof(cap->bus_info)); |
822 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | | 822 | cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | |
823 | V4L2_CAP_READWRITE | V4L2_CAP_DEVICE_CAPS; | 823 | V4L2_CAP_READWRITE; |
824 | cap->device_caps = cap->capabilities; | 824 | cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; |
825 | return 0; | 825 | return 0; |
826 | } | 826 | } |
827 | 827 | ||