提交 534bc3e2 编写于 作者: H Hans Verkuil 提交者: Mauro Carvalho Chehab

[media] saa7164: fix querycap warning

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: NHans Verkuil <hans.verkuil@cisco.com>
Cc: <stable@vger.kernel.org>      # for v3.19 and up
Signed-off-by: NMauro Carvalho Chehab <mchehab@osg.samsung.com>
上级 fb6bcec3
...@@ -721,13 +721,14 @@ static int vidioc_querycap(struct file *file, void *priv, ...@@ -721,13 +721,14 @@ static int vidioc_querycap(struct file *file, void *priv,
sizeof(cap->card)); sizeof(cap->card));
sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
cap->capabilities = cap->device_caps =
V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_CAPTURE |
V4L2_CAP_READWRITE | V4L2_CAP_READWRITE |
0; V4L2_CAP_TUNER;
cap->capabilities |= V4L2_CAP_TUNER; cap->capabilities = cap->device_caps |
cap->version = 0; V4L2_CAP_VBI_CAPTURE |
V4L2_CAP_DEVICE_CAPS;
return 0; return 0;
} }
......
...@@ -660,13 +660,14 @@ static int vidioc_querycap(struct file *file, void *priv, ...@@ -660,13 +660,14 @@ static int vidioc_querycap(struct file *file, void *priv,
sizeof(cap->card)); sizeof(cap->card));
sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci)); sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
cap->capabilities = cap->device_caps =
V4L2_CAP_VBI_CAPTURE | V4L2_CAP_VBI_CAPTURE |
V4L2_CAP_READWRITE | V4L2_CAP_READWRITE |
0; V4L2_CAP_TUNER;
cap->capabilities |= V4L2_CAP_TUNER; cap->capabilities = cap->device_caps |
cap->version = 0; V4L2_CAP_VIDEO_CAPTURE |
V4L2_CAP_DEVICE_CAPS;
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册