diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-04-01 13:27:52 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-02 03:56:08 -0400 |
commit | 3bbe5a83996c0a669250d91421eef054f3a30595 (patch) | |
tree | 1405195a5c6a955f5a091ef3b1b3578be4e5c61e /drivers/media/video/tuner-core.c | |
parent | c097b04520a3ab69a94f63f3f1d6716864c07300 (diff) |
V4L/DVB (3697): More msp3400 and bttv fixes
- 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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/tuner-core.c')
-rw-r--r-- | drivers/media/video/tuner-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index bbcb281cc391..d68137f2eb8c 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c | |||
@@ -558,10 +558,10 @@ static inline int set_mode(struct i2c_client *client, struct tuner *t, int mode, | |||
558 | 558 | ||
559 | static inline int check_v4l2(struct tuner *t) | 559 | static inline int check_v4l2(struct tuner *t) |
560 | { | 560 | { |
561 | if (t->using_v4l2) { | 561 | /* bttv still uses both v4l1 and v4l2 calls to the tuner (v4l2 for |
562 | tuner_dbg ("ignore v4l1 call\n"); | 562 | TV, v4l1 for radio), until that is fixed this code is disabled. |
563 | return EINVAL; | 563 | Otherwise the radio (v4l1) wouldn't tune after using the TV (v4l2) |
564 | } | 564 | first. */ |
565 | return 0; | 565 | return 0; |
566 | } | 566 | } |
567 | 567 | ||