---

yaml --- r: 273567 b: refs/heads/master c: 68e4798 h: refs/heads/master i: 273565: 8d8b7fb 273563: 075fdc9 273559: 3eb06a4 273551: f431222 273535: 4a84f9c v: v3
git-mirror · Oct 27, 2011 · 5128df2 · 5128df2
1 parent 50eac72
commit 5128df2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b01a3d69f85c0af0934451e0f5457f2f6e7f3e63
+refs/heads/master: 68e47981437686e58de1edc616d6c3043e01f07e
diff --git a/trunk/sound/soc/codecs/tlv320aic3x.c b/trunk/sound/soc/codecs/tlv320aic3x.c
@@ -1023,6 +1023,7 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai,
 		break;
 	case SND_SOC_DAIFMT_CBS_CFS:
 		aic3x->master = 0;
+		iface_areg &= ~(BIT_CLK_MASTER | WORD_CLK_MASTER);
 		break;
 	default:
 		return -EINVAL;