aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ttpci/av7110_v4l.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-12-30 07:04:34 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-02 17:11:34 -0200
commit069b747931f13eda289c1d59a09ecc8162281a76 (patch)
tree144b8ebf131eba4f3468d8d3f52bd192bc2e4f76 /drivers/media/dvb/ttpci/av7110_v4l.c
parent4ab9203b1b7e45f1beae7eb0c67d663a26257a69 (diff)
downloadkernel_samsung_smdk4412-069b747931f13eda289c1d59a09ecc8162281a76.zip
kernel_samsung_smdk4412-069b747931f13eda289c1d59a09ecc8162281a76.tar.gz
kernel_samsung_smdk4412-069b747931f13eda289c1d59a09ecc8162281a76.tar.bz2
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/dvb/ttpci/av7110_v4l.c')
-rw-r--r--drivers/media/dvb/ttpci/av7110_v4l.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index 315ba6f..c5b9c70 100644
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -316,7 +316,7 @@ static int av7110_dvb_c_switch(struct saa7146_fh *fh)
return 0;
}
-static int av7110_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
+static long av7110_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
{
struct saa7146_dev *dev = fh->dev;
struct av7110 *av7110 = (struct av7110*) dev->ext_priv;