diff options
| author | Hans Verkuil | 2008-12-30 07:04:34 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2009-01-02 17:11:34 -0200 |
| commit | 069b747931f13eda289c1d59a09ecc8162281a76 (patch) | |
| tree | 144b8ebf131eba4f3468d8d3f52bd192bc2e4f76 /drivers/media/video/arv.c | |
| parent | 4ab9203b1b7e45f1beae7eb0c67d663a26257a69 (diff) | |
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/arv.c')
| -rw-r--r-- | drivers/media/video/arv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c index f18fb7367e9a..d137bac84511 100644 --- a/drivers/media/video/arv.c +++ b/drivers/media/video/arv.c @@ -396,7 +396,7 @@ out_up: return ret; } -static int ar_do_ioctl(struct file *file, unsigned int cmd, void *arg) +static long ar_do_ioctl(struct file *file, unsigned int cmd, void *arg) { struct video_device *dev = video_devdata(file); struct ar_device *ar = video_get_drvdata(dev); @@ -539,7 +539,7 @@ static int ar_do_ioctl(struct file *file, unsigned int cmd, void *arg) return 0; } -static int ar_ioctl(struct file *file, unsigned int cmd, +static long ar_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { return video_usercopy(file, cmd, arg, ar_do_ioctl); |