diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-12-30 10:04:34 (GMT) |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-02 19:11:34 (GMT) |
commit | 069b747931f13eda289c1d59a09ecc8162281a76 (patch) | |
tree | 144b8ebf131eba4f3468d8d3f52bd192bc2e4f76 /drivers/media/video/vino.c | |
parent | 4ab9203b1b7e45f1beae7eb0c67d663a26257a69 (diff) | |
download | linux-fsl-qoriq-069b747931f13eda289c1d59a09ecc8162281a76.tar.xz |
V4L/DVB (10138): v4l2-ioctl: change to long return type to match unlocked_ioctl.
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.
Cc: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/vino.c')
-rw-r--r-- | drivers/media/video/vino.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index 63863fa..88bf845 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c @@ -4237,7 +4237,7 @@ error: return ret; } -static int vino_do_ioctl(struct file *file, unsigned int cmd, void *arg) +static long vino_do_ioctl(struct file *file, unsigned int cmd, void *arg) { struct vino_channel_settings *vcs = video_drvdata(file); @@ -4343,11 +4343,11 @@ static int vino_do_ioctl(struct file *file, unsigned int cmd, void *arg) return 0; } -static int vino_ioctl(struct file *file, +static long vino_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { struct vino_channel_settings *vcs = video_drvdata(file); - int ret; + long ret; if (mutex_lock_interruptible(&vcs->mutex)) return -EINTR; |