diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-12-30 05:04:34 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-02 14:11:34 -0500 |
commit | 069b747931f13eda289c1d59a09ecc8162281a76 (patch) | |
tree | 144b8ebf131eba4f3468d8d3f52bd192bc2e4f76 /drivers/media/video/ivtv | |
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/ivtv')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c index a6cd02460e75..1f6ca93b9840 100644 --- a/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/drivers/media/video/ivtv/ivtv-ioctl.c | |||
@@ -1725,7 +1725,7 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg) | |||
1725 | return 0; | 1725 | return 0; |
1726 | } | 1726 | } |
1727 | 1727 | ||
1728 | static int ivtv_default(struct file *file, void *fh, int cmd, void *arg) | 1728 | static long ivtv_default(struct file *file, void *fh, int cmd, void *arg) |
1729 | { | 1729 | { |
1730 | struct ivtv *itv = ((struct ivtv_open_id *)fh)->itv; | 1730 | struct ivtv *itv = ((struct ivtv_open_id *)fh)->itv; |
1731 | 1731 | ||