diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 02:17:30 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 02:17:30 +0100 |
| commit | 4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb (patch) | |
| tree | 8dd15df476c14b4ab85d5beca775af561c2ea23d /sound/soc/codecs/tlv320aic3x.c | |
| parent | ASoC: Disable thermal shutdown when not using speakers in wm_hubs (diff) | |
| parent | ASoC: Ensure we get an impedence reported for WM8958 jack detect (diff) | |
| download | linux-4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb.tar.xz linux-4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb.zip | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index a77f6ea47198..14cb5534ce8b 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; |