summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/tuner-core.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-04-01 20:27:52 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2006-04-01 20:27:52 +0200
commit0932c037375ef26f5d0cfbec3742519e0f0d5cae (patch)
tree91835f4dc22446069d3354a74c68fd5f08551009 /linux/drivers/media/video/tuner-core.c
parent950e8155e83cdf480a41449cf024494b6ec25e69 (diff)
downloadmediapointer-dvb-s2-0932c037375ef26f5d0cfbec3742519e0f0d5cae.tar.gz
mediapointer-dvb-s2-0932c037375ef26f5d0cfbec3742519e0f0d5cae.tar.bz2
More msp3400 and bttv fixes
From: Hans Verkuil <hverkuil@xs4all.nl> - remove obsolete VIDIOC_S_INPUT i2c call in bttv - translate VIDIOCSFREQ to VIDIOC_S_FREQUENCY in i2c call - improve muting during carrier scan in msp3400 - don't start scan unless really needed. - no longer reset chip for msp3400c/d. - remove v4l2 check in tuner-core (radio stops after using the TV) - add missing VIDIOC_INT_ strings in v4l2-common.c Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/tuner-core.c')
-rw-r--r--linux/drivers/media/video/tuner-core.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 87581654f..15282bbbb 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -615,10 +615,16 @@ static inline int set_mode(struct i2c_client *client, struct tuner *t, int mode,
static inline int check_v4l2(struct tuner *t)
{
+ /* bttv still uses both v4l1 and v4l2 calls to the tuner (v4l2 for
+ TV, v4l1 for radio), until that is fixed this code is disabled.
+ Otherwise the radio (v4l1) wouldn't tune after using the TV (v4l2)
+ first. */
+#if 0
if (t->using_v4l2) {
tuner_dbg ("ignore v4l1 call\n");
return EINVAL;
}
+#endif
return 0;
}