diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-07 20:17:30 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-07 20:17:30 -0500 |
| commit | 4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb (patch) | |
| tree | 8dd15df476c14b4ab85d5beca775af561c2ea23d /sound/soc/codecs/tlv320aic3x.c | |
| parent | 03431972ac16bbfcbfb831bb37c419f8f71bf16d (diff) | |
| parent | 19940b3d55c87d8089a8cb0fa8e5a9918a3846bd (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.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, | |||
| 1021 | break; | 1021 | break; |
| 1022 | case SND_SOC_DAIFMT_CBS_CFS: | 1022 | case SND_SOC_DAIFMT_CBS_CFS: |
| 1023 | aic3x->master = 0; | 1023 | aic3x->master = 0; |
| 1024 | iface_areg &= ~(BIT_CLK_MASTER | WORD_CLK_MASTER); | ||
| 1024 | break; | 1025 | break; |
| 1025 | default: | 1026 | default: |
| 1026 | return -EINVAL; | 1027 | return -EINVAL; |