diff mbox

[RFC,03/10] bttv: do not save the audio input in audio_mux()

Message ID 1363807490-3906-4-git-send-email-fschaefer.oss@googlemail.com (mailing list archive)
State RFC, archived
Headers

Commit Message

Frank Schaefer March 20, 2013, 7:24 p.m. UTC 
  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>
---
 drivers/media/pci/bt8xx/bttv-driver.c |   10 +++++-----
 1 Datei geändert, 5 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-)

Comments

Hans Verkuil March 21, 2013, 10:28 a.m. UTC | #1 
On Wed 20 March 2013 20:24:43 Frank Schäfer wrote:
> 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.

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>

Regards,

	Hans

> 
> Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
> ---
>  drivers/media/pci/bt8xx/bttv-driver.c |   10 +++++-----
>  1 Datei geändert, 5 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-)
> 
> diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
> index a082ab4..e01a8d8 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);
>  	}
>  }
>  
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index a082ab4..e01a8d8 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);
 	}
 }