summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <devnull@localhost>2005-07-04 22:34:39 +0000
committerNickolay V. Shmyrev <devnull@localhost>2005-07-04 22:34:39 +0000
commit01d089cbd4d0baf6c2bbd2665e445995d8e67265 (patch)
tree51acc3e4fd9cf7198a33c60372fbc9af7bed2549
parenta2963cc78849a68790507ac7972944927d7bf5d9 (diff)
downloadmediapointer-dvb-s2-01d089cbd4d0baf6c2bbd2665e445995d8e67265.tar.gz
mediapointer-dvb-s2-01d089cbd4d0baf6c2bbd2665e445995d8e67265.tar.bz2
Fix v4l1 call VIDIOCGTUNER to tuner
-rw-r--r--linux/drivers/media/video/tuner-core.c9
-rw-r--r--v4l/ChangeLog5
2 files changed, 11 insertions, 3 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index c6486aa59..67f956a4f 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -1,5 +1,5 @@
/*
- * $Id: tuner-core.c,v 1.47 2005/07/03 18:29:45 mchehab Exp $
+ * $Id: tuner-core.c,v 1.48 2005/07/04 22:34:39 nsh Exp $
*
* i2c tv tuner chip device driver
* core core, i.e. kernel interfaces, registering and so on
@@ -411,7 +411,10 @@ static inline int set_mode(struct i2c_client *client, struct tuner *t, int mode,
return EINVAL;
} else {
t->admin_status &= ~T_STANDBY;
- set_freq (client, t->freq);
+ if (t->mode == V4L2_TUNER_RADIO)
+ set_freq (client, t->freq * 1000);
+ else
+ set_freq (client, t->freq / 1000);
}
}
return 0;
@@ -524,7 +527,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
vt->flags &=
~VIDEO_TUNER_STEREO_ON;
}
- vt->flags |= V4L2_TUNER_CAP_LOW; /* Allow freqs at 62.5 Hz */
+ vt->flags |= VIDEO_TUNER_LOW; /* Allow freqs at 62.5 Hz */
vt->rangelow = radio_range[0] * 16000;
vt->rangehigh = radio_range[1] * 16000;
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 26ab965c3..8a86cc1ce 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-04 18:23 nshmyrev
+ * tuner-core.c:
+
+ - Fix setting of VIDEO_TUNER_LOW in v4l1 mode with radio.
+
2005-07-04 15:23 mkrufky
* cx88-cards.c, cx88-dvb.c, cx88-mpeg.c:
* dvb-pll.c, dvb-pll.h: