diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-03-27 08:04:23 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-14 19:45:23 -0300 |
| commit | cd634f1bfc182e564f33809fdca33027bb99fceb (patch) | |
| tree | e81c3b626866a64b8152576cb500ee2fc2fe40a0 /include/media | |
| parent | dfc2e12df02d49a1567bc90989ceef870cf5b147 (diff) | |
| download | linux-3.10-cd634f1bfc182e564f33809fdca33027bb99fceb.tar.gz linux-3.10-cd634f1bfc182e564f33809fdca33027bb99fceb.tar.bz2 linux-3.10-cd634f1bfc182e564f33809fdca33027bb99fceb.zip | |
[media] v4l2: put VIDIOC_DBG_G_CHIP_NAME under ADV_DEBUG
Only enable this ioctl if the VIDEO_ADV_DEBUG config option is set. This
prevents abuse from both userspace and kernelspace (some bridge drivers
abuse DBG_G_CHIP_IDENT, lets prevent that from happening again with this
ioctl).
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/v4l2-ioctl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h index b273f0e8181..6b917d69e40 100644 --- a/include/media/v4l2-ioctl.h +++ b/include/media/v4l2-ioctl.h @@ -243,12 +243,12 @@ struct v4l2_ioctl_ops { struct v4l2_dbg_register *reg); int (*vidioc_s_register) (struct file *file, void *fh, const struct v4l2_dbg_register *reg); -#endif - int (*vidioc_g_chip_ident) (struct file *file, void *fh, - struct v4l2_dbg_chip_ident *chip); int (*vidioc_g_chip_name) (struct file *file, void *fh, struct v4l2_dbg_chip_name *chip); +#endif + int (*vidioc_g_chip_ident) (struct file *file, void *fh, + struct v4l2_dbg_chip_ident *chip); int (*vidioc_enum_framesizes) (struct file *file, void *fh, struct v4l2_frmsizeenum *fsize); |