summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/stradis.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-12-30 11:04:34 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-02 20:11:34 +0100
commit069b747931f13eda289c1d59a09ecc8162281a76 (patch)
tree144b8ebf131eba4f3468d8d3f52bd192bc2e4f76 /drivers/media/video/stradis.c
parentV4L/DVB (10137): v4l2-compat32: only build if needed (diff)
downloadlinux-069b747931f13eda289c1d59a09ecc8162281a76.tar.xz
linux-069b747931f13eda289c1d59a09ecc8162281a76.zip
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/stradis.c')
-rw-r--r--drivers/media/video/stradis.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index 10d2608501ae..0eb313082c97 100644
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -1275,7 +1275,7 @@ static void make_clip_tab(struct saa7146 *saa, struct video_clip *cr, int ncr)
clip_draw_rectangle(clipmap, 0, 0, 1024, -saa->win.y);
}
-static int saa_ioctl(struct file *file,
+static long saa_ioctl(struct file *file,
unsigned int cmd, unsigned long argl)
{
struct saa7146 *saa = file->private_data;