diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 20:15:43 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 20:15:43 -0200 |
commit | c278ca42f16bc64d3fd053d6dd1b85d0e932bbae (patch) | |
tree | a9dee67f4d0dd8a4e6db382b37f9e51ab2f54b4c /linux/include/media/v4l2-ioctl.h | |
parent | 33cef62634c7f0a4b54be792d7d1c4e1b807f4d9 (diff) | |
download | mediapointer-dvb-s2-c278ca42f16bc64d3fd053d6dd1b85d0e932bbae.tar.gz mediapointer-dvb-s2-c278ca42f16bc64d3fd053d6dd1b85d0e932bbae.tar.bz2 |
v4l2-ioctl: Fix warnings when using .unlocked_ioctl = __video_ioctl2
From: Mauro Carvalho Chehab <mchehab@redhat.com>
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.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media/v4l2-ioctl.h')
-rw-r--r-- | linux/include/media/v4l2-ioctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/include/media/v4l2-ioctl.h b/linux/include/media/v4l2-ioctl.h index c884432f9..fcdb58c4c 100644 --- a/linux/include/media/v4l2-ioctl.h +++ b/linux/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 |