summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/tlv320aic3x.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-08 01:17:30 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-08 01:17:30 +0000
commit4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb (patch)
tree8dd15df476c14b4ab85d5beca775af561c2ea23d /sound/soc/codecs/tlv320aic3x.c
parent03431972ac16bbfcbfb831bb37c419f8f71bf16d (diff)
parent19940b3d55c87d8089a8cb0fa8e5a9918a3846bd (diff)
Merge branch 'for-3.2' into for-3.3
Conflicts: sound/soc/codecs/wm8940.c
Diffstat (limited to 'sound/soc/codecs/tlv320aic3x.c')
-rw-r--r--sound/soc/codecs/tlv320aic3x.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index a77f6ea4719..14cb5534ce8 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1021,6 +1021,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;