diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2012-06-07 11:20:31 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-06-11 15:47:21 -0300 |
| commit | 1761a110a9c36ad9ba26b104516677ad8cb38a08 (patch) | |
| tree | 19e9b538cb90c6f62a565ace18b9343bc8fd96c5 /include | |
| parent | d9762df4a9d0e412b6676a96135323d6924406b8 (diff) | |
| download | linux-3.10-1761a110a9c36ad9ba26b104516677ad8cb38a08.tar.gz linux-3.10-1761a110a9c36ad9ba26b104516677ad8cb38a08.tar.bz2 linux-3.10-1761a110a9c36ad9ba26b104516677ad8cb38a08.zip | |
[media] Fix regression in ioctl numbering
Yuck. The VIDIOC_(TRY_)DECODER_CMD ioctls already had ioctl numbers 96 and 97,
and after merging the timings API I forgot to continue numbering from 98. So
now we have two ioctls with number 96 and two with 97.
With the new table-driver ioctl handling in v4l2-ioctl.c it is essential that
each ioctl has its own unique number, so let's fix this quickly for 3.5.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/videodev2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 370d11106c1..2039c5d3292 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -2640,9 +2640,9 @@ struct v4l2_create_buffers { /* Experimental, these three ioctls may change over the next couple of kernel versions. */ -#define VIDIOC_ENUM_DV_TIMINGS _IOWR('V', 96, struct v4l2_enum_dv_timings) -#define VIDIOC_QUERY_DV_TIMINGS _IOR('V', 97, struct v4l2_dv_timings) -#define VIDIOC_DV_TIMINGS_CAP _IOWR('V', 98, struct v4l2_dv_timings_cap) +#define VIDIOC_ENUM_DV_TIMINGS _IOWR('V', 98, struct v4l2_enum_dv_timings) +#define VIDIOC_QUERY_DV_TIMINGS _IOR('V', 99, struct v4l2_dv_timings) +#define VIDIOC_DV_TIMINGS_CAP _IOWR('V', 100, struct v4l2_dv_timings_cap) /* Reminder: when adding new ioctls please add support for them to drivers/media/video/v4l2-compat-ioctl32.c as well! */ |