---

yaml --- r: 270706 b: refs/heads/master c: 6d447be h: refs/heads/master v: v3
git-mirror · Sep 30, 2011 · 6cc7fe0 · 6cc7fe0
1 parent 4699376
commit 6cc7fe0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f79e5e8ce221c0c2e0754eb7076ba7611f209001
+refs/heads/master: 6d447be0141991d80433e098d6267f7498ba6071
diff --git a/trunk/sound/soc/codecs/rt5631.c b/trunk/sound/soc/codecs/rt5631.c
@@ -343,20 +343,6 @@ static int check_dacr_to_spkmixr(struct snd_soc_dapm_widget *source,
 	return !(reg & RT5631_M_DAC_R_TO_SPKMIXER_R);
 }
 
-static int check_vdac_to_outmix(struct snd_soc_dapm_widget *source,
-			 struct snd_soc_dapm_widget *sink)
-{
-	unsigned int reg, ret = 1;
-
-	reg = snd_soc_read(source->codec, RT5631_OUTMIXER_L_CTRL);
-	if (reg & RT5631_M_VDAC_TO_OUTMIXER_L) {
-		reg = snd_soc_read(source->codec, RT5631_OUTMIXER_R_CTRL);
-		if (reg & RT5631_M_VDAC_TO_OUTMIXER_R)
-			ret = 0;
-	}
-	return ret;
-}
-
 static int check_adcl_select(struct snd_soc_dapm_widget *source,
 			 struct snd_soc_dapm_widget *sink)
 {