redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[media] saa7164: fix querycap warning

Browse source 
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 <hans.verkuil@cisco.com>
Cc: <stable@vger.kernel.org>      # for v3.19 and up
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil 2015-03-27 15:17:56 -03:00 committed by Mauro Carvalho Chehab
parent fb6bcec3ce
commit 534bc3e2ee
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/media/pci/saa7164/saa7164-encoder.c
View file

@ -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;
}

11
drivers/media/pci/saa7164/saa7164-vbi.c
View file

@ -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;
}