diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2015-03-09 03:20:03 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-04-01 05:56:56 -0400 |
commit | 6b46211f0a3b18b2360275ac29c4d6bfdf7bc015 (patch) | |
tree | ae2c092da42adeb7550449d7637838441be03b39 /drivers/media | |
parent | ab3120300be067a2d41a027c41db0b2c662ab200 (diff) |
[media] cx23885: fix querycap
cap->device_caps wasn't set in cx23885-417.c causing a warning from
the v4l2-core.
Reported-by: Joseph Jasi <joe.yasi@gmail.com>
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>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/pci/cx23885/cx23885-417.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c index e4901a503c73..63c0ee5d0bf5 100644 --- a/drivers/media/pci/cx23885/cx23885-417.c +++ b/drivers/media/pci/cx23885/cx23885-417.c | |||
@@ -1339,14 +1339,13 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
1339 | strlcpy(cap->driver, dev->name, sizeof(cap->driver)); | 1339 | strlcpy(cap->driver, dev->name, sizeof(cap->driver)); |
1340 | strlcpy(cap->card, cx23885_boards[tsport->dev->board].name, | 1340 | strlcpy(cap->card, cx23885_boards[tsport->dev->board].name, |
1341 | sizeof(cap->card)); | 1341 | sizeof(cap->card)); |
1342 | sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); | 1342 | sprintf(cap->bus_info, "PCIe:%s", pci_name(dev->pci)); |
1343 | cap->capabilities = | 1343 | cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | |
1344 | V4L2_CAP_VIDEO_CAPTURE | | 1344 | V4L2_CAP_STREAMING; |
1345 | V4L2_CAP_READWRITE | | ||
1346 | V4L2_CAP_STREAMING | | ||
1347 | 0; | ||
1348 | if (dev->tuner_type != TUNER_ABSENT) | 1345 | if (dev->tuner_type != TUNER_ABSENT) |
1349 | cap->capabilities |= V4L2_CAP_TUNER; | 1346 | cap->device_caps |= V4L2_CAP_TUNER; |
1347 | cap->capabilities = cap->device_caps | V4L2_CAP_VBI_CAPTURE | | ||
1348 | V4L2_CAP_AUDIO | V4L2_CAP_DEVICE_CAPS; | ||
1350 | 1349 | ||
1351 | return 0; | 1350 | return 0; |
1352 | } | 1351 | } |