From 5128df26996711ea69eb269f11e7270a11de3451 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Thu, 27 Oct 2011 16:38:42 +0800
Subject: [PATCH] --- yaml --- r: 273567 b: refs/heads/master c:
 68e47981437686e58de1edc616d6c3043e01f07e h: refs/heads/master i:   273565:
 8d8b7fb9006d8a3831e56e20ad6178cbcb627dea   273563:
 075fdc92f13406939560c94998377cf6e044ac9c   273559:
 3eb06a4c580a0b12d88bd22d8f93ba6152d399db   273551:
 f4312225a08018d37f5aa2a85c3700402470f361   273535:
 4a84f9cd1a40de3784983399b2c89829a52e01b4 v: v3

---
 [refs]                               | 2 +-
 trunk/sound/soc/codecs/tlv320aic3x.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b9a4703c8ff3..6cbccb69ca75 100644
--- 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
index 7a49390bc30d..87d5ef188e29 100644
--- 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;