From 6019b6d615d906ccdb78d0e40573b2a056c8b8c2 Mon Sep 17 00:00:00 2001
From: Frank Schaefer <fschaefer.oss@googlemail.com>
Date: Thu, 21 Mar 2013 13:51:16 -0300
Subject: [PATCH] --- yaml --- r: 366745 b: refs/heads/master c:
 2166f0a9710413ea60bd72a4983de11b764468e4 h: refs/heads/master i:   366743:
 04ac01814e479cecd2388da9eaaeb929d83e09f2 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/media/pci/bt8xx/bttv-cards.c  |  2 +-
 trunk/drivers/media/pci/bt8xx/bttv-driver.c | 12 ++++++------
 trunk/drivers/media/pci/bt8xx/bttvp.h       |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index c91d3a8730a9..500c2c7e1d0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20167f17f19a5d842f74c3375468f68bf039eaa5
+refs/heads/master: 2166f0a9710413ea60bd72a4983de11b764468e4
diff --git a/trunk/drivers/media/pci/bt8xx/bttv-cards.c b/trunk/drivers/media/pci/bt8xx/bttv-cards.c
index fa0faaa2a49a..b7dc921e1b91 100644
--- a/trunk/drivers/media/pci/bt8xx/bttv-cards.c
+++ b/trunk/drivers/media/pci/bt8xx/bttv-cards.c
@@ -3947,7 +3947,7 @@ static void avermedia_eeprom(struct bttv *btv)
 u32 bttv_tda9880_setnorm(struct bttv *btv, u32 gpiobits)
 {
 
-	if (btv->audio == TVAUDIO_INPUT_TUNER) {
+	if (btv->audio_input == TVAUDIO_INPUT_TUNER) {
 		if (bttv_tvnorms[btv->tvnorm].v4l2_id & V4L2_STD_MN)
 			gpiobits |= 0x10000;
 		else
diff --git a/trunk/drivers/media/pci/bt8xx/bttv-driver.c b/trunk/drivers/media/pci/bt8xx/bttv-driver.c
index e01a8d8c9fd0..81ee70d93189 100644
--- a/trunk/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/trunk/drivers/media/pci/bt8xx/bttv-driver.c
@@ -1093,7 +1093,7 @@ audio_mux(struct bttv *btv, int input, int mute)
 static inline int
 audio_mute(struct bttv *btv, int mute)
 {
-	return audio_mux(btv, btv->audio, mute);
+	return audio_mux(btv, btv->audio_input, mute);
 }
 
 static inline int
@@ -1195,9 +1195,9 @@ set_input(struct bttv *btv, unsigned int input, unsigned int norm)
 	} else {
 		video_mux(btv,input);
 	}
-	btv->audio = (btv->tuner_type != TUNER_ABSENT && input == 0) ?
-			 TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN;
-	audio_input(btv, btv->audio);
+	btv->audio_input = (btv->tuner_type != TUNER_ABSENT && input == 0) ?
+				TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN;
+	audio_input(btv, btv->audio_input);
 	set_tvnorm(btv, norm);
 }
 
@@ -1706,8 +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);
-		btv->audio = TVAUDIO_INPUT_RADIO;
-		audio_input(btv, btv->audio);
+		btv->audio_input = TVAUDIO_INPUT_RADIO;
+		audio_input(btv, btv->audio_input);
 	}
 }
 
diff --git a/trunk/drivers/media/pci/bt8xx/bttvp.h b/trunk/drivers/media/pci/bt8xx/bttvp.h
index e7910e0ffa05..9c1cc2c50ee2 100644
--- a/trunk/drivers/media/pci/bt8xx/bttvp.h
+++ b/trunk/drivers/media/pci/bt8xx/bttvp.h
@@ -423,7 +423,7 @@ struct bttv {
 
 	/* video state */
 	unsigned int input;
-	unsigned int audio;
+	unsigned int audio_input;
 	unsigned int mute;
 	unsigned long tv_freq;
 	unsigned int tvnorm;