diff options
author | Douglas Schilling Landgraf <dougsland@gmail.com> | 2008-04-22 13:46:11 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:07:53 -0400 |
commit | 078ff7953448163d8779e489bd0119dd9a9b4732 (patch) | |
tree | b323e971c55d11e5f973a513c8b9dc20bd8f892a /drivers/media/video/usbvideo | |
parent | 03dea86de2243d5b3932604b799be26efeff010d (diff) |
V4L/DVB (7402): add macro validation for v4l_compat_ioctl32
Added macro CONFIG_COMPAT for v4l_compat_ioctl32.
Signed-off-by: Douglas Schilling Landgraf <dougsland@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/usbvideo')
-rw-r--r-- | drivers/media/video/usbvideo/usbvideo.c | 2 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/vicam.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c index 7f3cdc9a0624..300188097de6 100644 --- a/drivers/media/video/usbvideo/usbvideo.c +++ b/drivers/media/video/usbvideo/usbvideo.c | |||
@@ -946,7 +946,9 @@ static const struct file_operations usbvideo_fops = { | |||
946 | .read = usbvideo_v4l_read, | 946 | .read = usbvideo_v4l_read, |
947 | .mmap = usbvideo_v4l_mmap, | 947 | .mmap = usbvideo_v4l_mmap, |
948 | .ioctl = usbvideo_v4l_ioctl, | 948 | .ioctl = usbvideo_v4l_ioctl, |
949 | #ifdef CONFIG_COMPAT | ||
949 | .compat_ioctl = v4l_compat_ioctl32, | 950 | .compat_ioctl = v4l_compat_ioctl32, |
951 | #endif | ||
950 | .llseek = no_llseek, | 952 | .llseek = no_llseek, |
951 | }; | 953 | }; |
952 | static const struct video_device usbvideo_template = { | 954 | static const struct video_device usbvideo_template = { |
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c index da1ba0211108..4d4795ae3bc7 100644 --- a/drivers/media/video/usbvideo/vicam.c +++ b/drivers/media/video/usbvideo/vicam.c | |||
@@ -1066,7 +1066,9 @@ static const struct file_operations vicam_fops = { | |||
1066 | .read = vicam_read, | 1066 | .read = vicam_read, |
1067 | .mmap = vicam_mmap, | 1067 | .mmap = vicam_mmap, |
1068 | .ioctl = vicam_ioctl, | 1068 | .ioctl = vicam_ioctl, |
1069 | #ifdef CONFIG_COMPAT | ||
1069 | .compat_ioctl = v4l_compat_ioctl32, | 1070 | .compat_ioctl = v4l_compat_ioctl32, |
1071 | #endif | ||
1070 | .llseek = no_llseek, | 1072 | .llseek = no_llseek, |
1071 | }; | 1073 | }; |
1072 | 1074 | ||