diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2012-06-07 12:32:07 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-06-11 15:48:22 -0300 |
| commit | 0b5dabedcc9498013d7de2998f0828340657c8a3 (patch) | |
| tree | e78f3d1c3bbf47a796c8e96d8f5a65e01e3cebac /drivers/media/video/v4l2-dev.c | |
| parent | 1761a110a9c36ad9ba26b104516677ad8cb38a08 (diff) | |
| download | op-kernel-dev-0b5dabedcc9498013d7de2998f0828340657c8a3.zip op-kernel-dev-0b5dabedcc9498013d7de2998f0828340657c8a3.tar.gz | |
[media] Fix query/enum_dv_timings regression
Now query/enum_dv_timings finally work again.
The timings API patches and the core ioctl changes clearly sailed right past
each other without realizing that both needed to adapt to the other.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/v4l2-dev.c')
| -rw-r--r-- | drivers/media/video/v4l2-dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c index 5ccbd46..1500208 100644 --- a/drivers/media/video/v4l2-dev.c +++ b/drivers/media/video/v4l2-dev.c @@ -679,6 +679,8 @@ static void determine_valid_ioctls(struct video_device *vdev) SET_VALID_IOCTL(ops, VIDIOC_QUERY_DV_PRESET, vidioc_query_dv_preset); SET_VALID_IOCTL(ops, VIDIOC_S_DV_TIMINGS, vidioc_s_dv_timings); SET_VALID_IOCTL(ops, VIDIOC_G_DV_TIMINGS, vidioc_g_dv_timings); + SET_VALID_IOCTL(ops, VIDIOC_ENUM_DV_TIMINGS, vidioc_enum_dv_timings); + SET_VALID_IOCTL(ops, VIDIOC_QUERY_DV_TIMINGS, vidioc_query_dv_timings); /* yes, really vidioc_subscribe_event */ SET_VALID_IOCTL(ops, VIDIOC_DQEVENT, vidioc_subscribe_event); SET_VALID_IOCTL(ops, VIDIOC_SUBSCRIBE_EVENT, vidioc_subscribe_event); |
