diff options
| author | Michael Krufky <devnull@localhost> | 2005-10-08 17:14:25 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-10-08 17:14:25 +0000 |
| commit | ba6785a02eea543976b0e44df844a43b660eaa64 (patch) | |
| tree | 7577a38fd434fb726defbc95d6470ab383821471 | |
| parent | 276ea322732e226ef84fe7fcb6ec7735fc59d8d5 (diff) | |
| download | mediapointer-dvb-s2-ba6785a02eea543976b0e44df844a43b660eaa64.tar.gz mediapointer-dvb-s2-ba6785a02eea543976b0e44df844a43b660eaa64.tar.bz2 | |
VIDIOCSFREQ and VIDIOCGFREQ expect an unsigned long as argument.
v4l1-compat.c expects an int. The first is 8 bytes for an AMD64, the
second only 4. This patch fixes this. I've checked other sources in the
v4l repository and they all use unsigned long, so this is the only place
that needs patching.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
| -rw-r--r-- | linux/drivers/media/video/v4l1-compat.c | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 8 |
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), |