Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8efb71d authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L (0978): 64-bit fixes for removing warnings on compat_ioctl32 



- 64-bit fixes for removing warnings on compat_ioctl32.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
parent 97e2a01b

drivers/media/video/compat_ioctl32.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

drivers/media/video/em28xx/em28xx-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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;