diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-01-09 12:24:59 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 12:24:59 -0500 |
commit | e8efb71d02d008a665ba88e6f75af691d9425e49 (patch) | |
tree | cbfc9e13c45aa9c606ac03dfd10aa0cc7a80c567 /drivers/media/video/compat_ioctl32.c | |
parent | 97e2a01b6bd995bc3438b361e58b126a2c3cc0ca (diff) |
V4L (0978): 64-bit fixes for removing warnings on compat_ioctl32
- 64-bit fixes for removing warnings on compat_ioctl32.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/video/compat_ioctl32.c')
-rw-r--r-- | drivers/media/video/compat_ioctl32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c index 99774c420689..5472d36d73ff 100644 --- a/drivers/media/video/compat_ioctl32.c +++ b/drivers/media/video/compat_ioctl32.c | |||
@@ -2,6 +2,7 @@ | |||
2 | #include <linux/compat.h> | 2 | #include <linux/compat.h> |
3 | #include <linux/videodev.h> | 3 | #include <linux/videodev.h> |
4 | #include <linux/module.h> | 4 | #include <linux/module.h> |
5 | #include <linux/smp_lock.h> | ||
5 | 6 | ||
6 | #ifdef CONFIG_COMPAT | 7 | #ifdef CONFIG_COMPAT |
7 | struct video_tuner32 { | 8 | struct video_tuner32 { |
@@ -307,9 +308,8 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) | |||
307 | case _IOR('v' , BASE_VIDIOCPRIVATE+7, int): | 308 | case _IOR('v' , BASE_VIDIOCPRIVATE+7, int): |
308 | ret = native_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); | 309 | ret = native_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); |
309 | break; | 310 | break; |
310 | |||
311 | return ret; | ||
312 | } | 311 | } |
312 | return ret; | ||
313 | } | 313 | } |
314 | #else | 314 | #else |
315 | long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) | 315 | long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) |