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>
git-mirror · Jan 9, 2006 · e8efb71 · e8efb71
1 parent 97e2a01
commit e8efb71
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c
@@ -2,6 +2,7 @@
 #include <linux/compat.h>
 #include <linux/videodev.h>
 #include <linux/module.h>
+#include <linux/smp_lock.h>
 
 #ifdef CONFIG_COMPAT
 struct video_tuner32 {
@@ -307,9 +308,8 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
 	case _IOR('v' , BASE_VIDIOCPRIVATE+7, int):
 		ret = native_ioctl(file, cmd, (unsigned long)compat_ptr(arg));
 		break;
-
-	return ret;
 	}
+	return ret;
 }
 #else
 long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)

diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
@@ -126,7 +126,7 @@ u32 em28xx_request_buffers(struct em28xx *dev, u32 count)
 	const size_t imagesize = PAGE_ALIGN(dev->frame_size);	/*needs to be page aligned cause the buffers can be mapped individually! */
 	void *buff = NULL;
 	u32 i;
-	em28xx_coredbg("requested %i buffers with size %zd", count, imagesize);
+	em28xx_coredbg("requested %i buffers with size %zi", count, imagesize);
 	if (count > EM28XX_NUM_FRAMES)
 		count = EM28XX_NUM_FRAMES;