From 20167f17f19a5d842f74c3375468f68bf039eaa5 Mon Sep 17 00:00:00 2001 From: Frank Schaefer Date: Thu, 21 Mar 2013 13:51:15 -0300 Subject: [PATCH] [media] bttv: do not save the audio input in audio_mux() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/media/pci/bt8xx/bttv-driver.c | 10 +++++----- 1 file 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); } } -- 2.34.1