summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/v4l1-compat.c6
-rw-r--r--v4l/ChangeLog8
2 files changed, 11 insertions, 3 deletions
diff --git a/linux/drivers/media/video/v4l1-compat.c b/linux/drivers/media/video/v4l1-compat.c
index f911c767b..be0220f2b 100644
--- a/linux/drivers/media/video/v4l1-compat.c
+++ b/linux/drivers/media/video/v4l1-compat.c
@@ -1,5 +1,5 @@
/*
- * $Id: v4l1-compat.c,v 1.11 2005/07/13 17:25:25 mchehab Exp $
+ * $Id: v4l1-compat.c,v 1.12 2005/10/08 17:14:25 mkrufky Exp $
*
* Video for Linux Two
* Backward Compatibility Layer
@@ -730,7 +730,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
}
case VIDIOCGFREQ: /* get frequency */
{
- int *freq = arg;
+ unsigned long *freq = arg;
freq2.tuner = 0;
err = drv(inode, file, VIDIOC_G_FREQUENCY, &freq2);
@@ -742,7 +742,7 @@ v4l_compat_translate_ioctl(struct inode *inode,
}
case VIDIOCSFREQ: /* set frequency */
{
- int *freq = arg;
+ unsigned long *freq = arg;
freq2.tuner = 0;
drv(inode, file, VIDIOC_G_FREQUENCY, &freq2);
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 2c036c855..1684ad3d3 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-08 17:02 mkrufky
+
+ * v4l1-compat.c: (v4l_compat_translate_ioctl):
+ - change VIDIOCSFREQ and VIDIOCGFREQ from int to unsigned long
+
+ Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-10-08 09:19 nshmyrev
* saa7134-alsa.c: (snd_saa7134_capsrc_put),