diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-11-03 18:20:53 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-11-03 18:20:53 +0100 |
| commit | 6bcbf64ace40d6833622d85701218a8bb7a4f207 (patch) | |
| tree | a8db5d361115448647c18b8eb403911ef5aba617 /sound/soc/codecs/tlv320aic23.c | |
| parent | 51e4152a969aa6d2306492ebf143932dcb535c9b (diff) | |
| parent | 0b7dd6ad92b6cace35dc5d06d6e236c2751c85dc (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/tlv320aic23.c')
| -rw-r--r-- | sound/soc/codecs/tlv320aic23.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index ab27dbcd1262..336de8f69a02 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c @@ -430,6 +430,7 @@ static int tlv320aic23_set_dai_fmt(struct snd_soc_dai *codec_dai, iface_reg |= TLV320AIC23_MS_MASTER; break; case SND_SOC_DAIFMT_CBS_CFS: + iface_reg &= ~TLV320AIC23_MS_MASTER; break; default: return -EINVAL; |