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

This project is archived. Its data is read-only.

Commit 92ab7886 authored Dec 29, 2008 by Mauro Carvalho Chehab

V4L/DVB (10110): v4l2-ioctl: Fix warnings when using .unlocked_ioctl = __video_ioctl2



This patch fixes this warning:

drivers/media/video/gspca/gspca.c:1811: warning: initialization from incompatible pointer type

The reason is that the returned argument should be a long, not an
integer.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 902571aa

drivers/media/video/v4l2-ioctl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1852,7 +1852,7 @@ static int __video_do_ioctl(struct file *file,
		return ret;
		}

		int __video_ioctl2(struct file *file,
		long __video_ioctl2(struct file *file,
		unsigned int cmd, unsigned long arg)
		{
		char sbuf[128];

include/media/v4l2-ioctl.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -297,7 +297,7 @@ extern int video_usercopy(struct file *file, unsigned int cmd,
		/* Standard handlers for V4L ioctl's */

		/* This prototype is used on fops.unlocked_ioctl */
		extern int __video_ioctl2(struct file *file,
		extern long __video_ioctl2(struct file *file,
		unsigned int cmd, unsigned long arg);

		/* This prototype is used on fops.ioctl