Commit e8efb71d02d008a665ba88e6f75af691d9425e49
Committed by
Mauro Carvalho Chehab
Mauro Carvalho Chehab
1 parent
97e2a01b6b
Exists in
master
and in
20 other branches
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>
Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff
drivers/media/video/compat_ioctl32.c
| ... | ... | @@ -2,6 +2,7 @@ |
| 2 | 2 | #include <linux/compat.h> |
| 3 | 3 | #include <linux/videodev.h> |
| 4 | 4 | #include <linux/module.h> |
| 5 | +#include <linux/smp_lock.h> | |
| 5 | 6 | |
| 6 | 7 | #ifdef CONFIG_COMPAT |
| 7 | 8 | struct video_tuner32 { |
| 8 | 9 | |
| ... | ... | @@ -307,9 +308,8 @@ |
| 307 | 308 | case _IOR('v' , BASE_VIDIOCPRIVATE+7, int): |
| 308 | 309 | ret = native_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); |
| 309 | 310 | break; |
| 310 | - | |
| 311 | - return ret; | |
| 312 | 311 | } |
| 312 | + return ret; | |
| 313 | 313 | } |
| 314 | 314 | #else |
| 315 | 315 | long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) |
drivers/media/video/em28xx/em28xx-core.c
| ... | ... | @@ -126,7 +126,7 @@ |
| 126 | 126 | const size_t imagesize = PAGE_ALIGN(dev->frame_size); /*needs to be page aligned cause the buffers can be mapped individually! */ |
| 127 | 127 | void *buff = NULL; |
| 128 | 128 | u32 i; |
| 129 | - em28xx_coredbg("requested %i buffers with size %zd", count, imagesize); | |
| 129 | + em28xx_coredbg("requested %i buffers with size %zi", count, imagesize); | |
| 130 | 130 | if (count > EM28XX_NUM_FRAMES) |
| 131 | 131 | count = EM28XX_NUM_FRAMES; |
| 132 | 132 |