diff options
| author | Frank Schaefer | 2013-03-21 17:51:15 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-03-23 15:30:55 +0100 |
| commit | 20167f17f19a5d842f74c3375468f68bf039eaa5 (patch) | |
| tree | 2132e0c0c792a3b57b1dd346ce05d8ca28f1e90b | |
| parent | [media] bttv: audio_mux(): do not change the value of the v4l2 mute control (diff) | |
| download | kernel-qcow2-linux-20167f17f19a5d842f74c3375468f68bf039eaa5.tar.gz kernel-qcow2-linux-20167f17f19a5d842f74c3375468f68bf039eaa5.tar.xz kernel-qcow2-linux-20167f17f19a5d842f74c3375468f68bf039eaa5.zip | |
[media] bttv: do not save the audio input in audio_mux()
We can't and do not save the mute setting in function audio_mux(), so we
should also not save the input in this function for consistency.
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/pci/bt8xx/bttv-driver.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index a082ab4efff8..e01a8d8c9fd0 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c @@ -999,8 +999,6 @@ audio_mux(struct bttv *btv, int input, int mute) bttv_tvcards[btv->c.type].gpiomask); signal = btread(BT848_DSTATUS) & BT848_DSTATUS_HLOC; - btv->audio = input; - /* automute */ mute_gpio = mute || (btv->opt_automute && (!signal || !btv->users) && !btv->has_radio_tuner); @@ -1197,8 +1195,9 @@ set_input(struct bttv *btv, unsigned int input, unsigned int norm) } else { video_mux(btv,input); } - audio_input(btv, (btv->tuner_type != TUNER_ABSENT && input == 0) ? - TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN); + btv->audio = (btv->tuner_type != TUNER_ABSENT && input == 0) ? + TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN; + audio_input(btv, btv->audio); set_tvnorm(btv, norm); } @@ -1707,7 +1706,8 @@ static void radio_enable(struct bttv *btv) if (!btv->has_radio_tuner) { btv->has_radio_tuner = 1; bttv_call_all(btv, tuner, s_radio); - audio_input(btv, TVAUDIO_INPUT_RADIO); + btv->audio = TVAUDIO_INPUT_RADIO; + audio_input(btv, btv->audio); } } |