Commit 92ab7886 authored by Mauro Carvalho Chehab's avatar 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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 902571aa
...@@ -1852,7 +1852,7 @@ static int __video_do_ioctl(struct file *file, ...@@ -1852,7 +1852,7 @@ static int __video_do_ioctl(struct file *file,
return ret; return ret;
} }
int __video_ioctl2(struct file *file, long __video_ioctl2(struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
char sbuf[128]; char sbuf[128];
......
...@@ -297,7 +297,7 @@ extern int video_usercopy(struct file *file, unsigned int cmd, ...@@ -297,7 +297,7 @@ extern int video_usercopy(struct file *file, unsigned int cmd,
/* Standard handlers for V4L ioctl's */ /* Standard handlers for V4L ioctl's */
/* This prototype is used on fops.unlocked_ioctl */ /* 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); unsigned int cmd, unsigned long arg);
/* This prototype is used on fops.ioctl /* This prototype is used on fops.ioctl
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment