summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/meye.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-12-30 11:04:34 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2008-12-30 11:04:34 +0100
commit3e6b888d8b2f7a4ebef1b4c33acb0d253488ea4a (patch)
tree8cde9ec972e040278b2fe93aab4509355409cb4d /linux/drivers/media/video/meye.c
parentdb66abb56195fcfe907beec7b9a3d29278306256 (diff)
downloadmediapointer-dvb-s2-3e6b888d8b2f7a4ebef1b4c33acb0d253488ea4a.tar.gz
mediapointer-dvb-s2-3e6b888d8b2f7a4ebef1b4c33acb0d253488ea4a.tar.bz2
v4l2-ioctl: change to long return type to match unlocked_ioctl.
From: Hans Verkuil <hverkuil@xs4all.nl> Since internal to v4l2 the ioctl prototype is the same regardless of it being called through .ioctl or .unlocked_ioctl, we need to convert it all to the long return type of unlocked_ioctl. Thanks to Jean-Francois Moine for posting an initial patch for this and thus bringing it to our attention. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> CC: Jean-Francois Moine <moinejf@free.fr>
Diffstat (limited to 'linux/drivers/media/video/meye.c')
-rw-r--r--linux/drivers/media/video/meye.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/meye.c b/linux/drivers/media/video/meye.c
index 649faa796..323aa378b 100644
--- a/linux/drivers/media/video/meye.c
+++ b/linux/drivers/media/video/meye.c
@@ -1582,7 +1582,7 @@ static int vidioc_streamoff(struct file *file, void *fh, enum v4l2_buf_type i)
return 0;
}
-static int vidioc_default(struct file *file, void *fh, int cmd, void *arg)
+static long vidioc_default(struct file *file, void *fh, int cmd, void *arg)
{
switch (cmd) {
case MEYEIOC_G_PARAMS: