summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 20:15:43 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 20:15:43 -0200
commitc278ca42f16bc64d3fd053d6dd1b85d0e932bbae (patch)
treea9dee67f4d0dd8a4e6db382b37f9e51ab2f54b4c /linux/drivers/media
parent33cef62634c7f0a4b54be792d7d1c4e1b807f4d9 (diff)
downloadmediapointer-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/drivers/media')
-rw-r--r--linux/drivers/media/video/v4l2-ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/v4l2-ioctl.c b/linux/drivers/media/video/v4l2-ioctl.c
index 86dd04026..9e32a2c56 100644
--- a/linux/drivers/media/video/v4l2-ioctl.c
+++ b/linux/drivers/media/video/v4l2-ioctl.c
@@ -1853,7 +1853,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];