diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 19:15:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 09:40:33 -0200 |
| commit | 92ab7886119da6375a983713eedab444e32094f6 (patch) | |
| tree | a17583daee778c35ff3013a04cabdbe8891411cd | |
| parent | 902571aaa91263bc27e923e94ddf161c106befee (diff) | |
| download | linux-92ab7886119da6375a983713eedab444e32094f6.tar.gz linux-92ab7886119da6375a983713eedab444e32094f6.tar.bz2 linux-92ab7886119da6375a983713eedab444e32094f6.zip | |
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>
| -rw-r--r-- | drivers/media/video/v4l2-ioctl.c | 2 | ||||
| -rw-r--r-- | include/media/v4l2-ioctl.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c index bef4286933a1..b063381f4b3b 100644 --- a/drivers/media/video/v4l2-ioctl.c +++ b/drivers/media/video/v4l2-ioctl.c @@ -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]; diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h index c884432f9383..fcdb58c4ce07 100644 --- a/include/media/v4l2-ioctl.h +++ b/include/media/v4l2-ioctl.h @@ -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 |