diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2015-03-08 23:20:03 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-19 10:10:26 +0200 |
| commit | 5ddff4d7c66c6a72ef745ea3c47a7ea79ff59741 (patch) | |
| tree | a11712e026ecb487827e02ca9b4173f4e130af1b | |
| parent | c80fa6bc02c20b574c6c2eba2996546f19fa69e1 (diff) | |
| download | linux-stable-5ddff4d7c66c6a72ef745ea3c47a7ea79ff59741.tar.gz linux-stable-5ddff4d7c66c6a72ef745ea3c47a7ea79ff59741.tar.bz2 linux-stable-5ddff4d7c66c6a72ef745ea3c47a7ea79ff59741.zip | |
cx23885: fix querycap
commit 6b46211f0a3b18b2360275ac29c4d6bfdf7bc015 upstream.
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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, strlcpy(cap->driver, dev->name, sizeof(cap->driver)); strlcpy(cap->card, cx23885_boards[tsport->dev->board].name, sizeof(cap->card)); - sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); - cap->capabilities = - V4L2_CAP_VIDEO_CAPTURE | - V4L2_CAP_READWRITE | - V4L2_CAP_STREAMING | - 0; + sprintf(cap->bus_info, "PCIe:%s", pci_name(dev->pci)); + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | + V4L2_CAP_STREAMING; if (dev->tuner_type != TUNER_ABSENT) - cap->capabilities |= V4L2_CAP_TUNER; + cap->device_caps |= V4L2_CAP_TUNER; + cap->capabilities = cap->device_caps | V4L2_CAP_VBI_CAPTURE | + V4L2_CAP_AUDIO | V4L2_CAP_DEVICE_CAPS; return 0; } |