From d9c791d626a4b53411412808420045b44d8d48cc Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Wed, 18 Jan 2012 11:48:59 +0100 Subject: [PATCH] --- yaml --- r: 286759 b: refs/heads/master c: 0c93a167a6b3fa510c74e88477852c41defda075 h: refs/heads/master i: 286757: 0d5dc48178fc18901a399d889082014f4a2810b1 286755: 8c80bd4e4983844e636e59fc52391208a7dca0ec 286751: da6981b8dfd6e165ac6b604f5aa934bb3eac5f15 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/tlv320aic32x4.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e1cc1d72b0e1..39dcecc786c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01b37e94c04bc6dae2c4837a2eb6fff6819ea82a +refs/heads/master: 0c93a167a6b3fa510c74e88477852c41defda075 diff --git a/trunk/sound/soc/codecs/tlv320aic32x4.c b/trunk/sound/soc/codecs/tlv320aic32x4.c index 3806cb6d9d4d..372b0b83bd9f 100644 --- a/trunk/sound/soc/codecs/tlv320aic32x4.c +++ b/trunk/sound/soc/codecs/tlv320aic32x4.c @@ -641,9 +641,11 @@ static int aic32x4_probe(struct snd_soc_codec *codec) if (aic32x4->power_cfg & AIC32X4_PWR_AVDD_DVDD_WEAK_DISABLE) { snd_soc_write(codec, AIC32X4_PWRCFG, AIC32X4_AVDDWEAKDISABLE); } - if (aic32x4->power_cfg & AIC32X4_PWR_AIC32X4_LDO_ENABLE) { - snd_soc_write(codec, AIC32X4_LDOCTL, AIC32X4_LDOCTLEN); - } + + tmp_reg = (aic32x4->power_cfg & AIC32X4_PWR_AIC32X4_LDO_ENABLE) ? + AIC32X4_LDOCTLEN : 0; + snd_soc_write(codec, AIC32X4_LDOCTL, tmp_reg); + tmp_reg = snd_soc_read(codec, AIC32X4_CMMODE); if (aic32x4->power_cfg & AIC32X4_PWR_CMMODE_LDOIN_RANGE_18_36) { tmp_reg |= AIC32X4_LDOIN_18_36;