diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-01-11 04:45:05 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-23 13:34:27 -0500 |
commit | 583aa3a9b5ca846a84f7dd87bdc4b75dca07b011 (patch) | |
tree | a86d9d5f2e9817e9faf9d2e06d212d4380924fe9 /drivers/media/video/cx231xx | |
parent | 93596ef7db3e9bcc9306c3e93cf28ce1048858b6 (diff) |
[media] V4L2: Add per-device-node capabilities
If V4L2_CAP_DEVICE_CAPS is set, then the new device_caps field is filled with
the capabilities of the opened device node.
The capabilities field traditionally contains the capabilities of the physical
device, being a superset of all capabilities available at the several device
nodes. E.g., if you open /dev/video0, then if it contains VBI caps then that means
that there is a corresponding vbi node as well. And the capabilities field of
both the video and vbi nodes should contain identical caps.
However, it would be very useful to also have a capabilities field that contains
just the caps for the currently open device, hence the new CAP bit and field.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx')
-rw-r--r-- | drivers/media/video/cx231xx/cx231xx-417.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-417.c b/drivers/media/video/cx231xx/cx231xx-417.c index f8f0e59cd583..d4327dab5a36 100644 --- a/drivers/media/video/cx231xx/cx231xx-417.c +++ b/drivers/media/video/cx231xx/cx231xx-417.c | |||
@@ -1686,7 +1686,6 @@ static struct v4l2_capability pvr_capability = { | |||
1686 | .capabilities = (V4L2_CAP_VIDEO_CAPTURE | | 1686 | .capabilities = (V4L2_CAP_VIDEO_CAPTURE | |
1687 | V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_RADIO | | 1687 | V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_RADIO | |
1688 | V4L2_CAP_STREAMING | V4L2_CAP_READWRITE), | 1688 | V4L2_CAP_STREAMING | V4L2_CAP_READWRITE), |
1689 | .reserved = {0, 0, 0, 0} | ||
1690 | }; | 1689 | }; |
1691 | static int vidioc_querycap(struct file *file, void *priv, | 1690 | static int vidioc_querycap(struct file *file, void *priv, |
1692 | struct v4l2_capability *cap) | 1691 | struct v4l2_capability *cap) |