]> err.no Git - linux-2.6/commitdiff
V4L (0978): 64-bit fixes for removing warnings on compat_ioctl32
authorHans Verkuil <hverkuil@xs4all.nl>
Mon, 9 Jan 2006 17:24:59 +0000 (15:24 -0200)
committerMauro Carvalho Chehab <mchehab@brturbo.com.br>
Mon, 9 Jan 2006 17:24:59 +0000 (15:24 -0200)
- 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>
drivers/media/video/compat_ioctl32.c
drivers/media/video/em28xx/em28xx-core.c

index 99774c42068952549d2af80106d6a8a35336dfcd..5472d36d73ff0550485af2e7e2ad933131a9e141 100644 (file)
@@ -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)
index 0cfe75416ec64a7af3242ccec6e8e4722796f35a..6d32bd64ce55db746f46d53fcea6bbc0e8de02ee 100644 (file)
@@ -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;