From 17bc747e9138f837b2b521859619f0ab878b04d2 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 7 Oct 2011 21:52:00 +0800 Subject: [PATCH] --- yaml --- r: 270815 b: refs/heads/master c: e46199ece4e0db886f90abe11d91b04601fd0300 h: refs/heads/master i: 270813: 224b1161ee6c3712d95a1a15fcaa4c11aac336e2 270811: 4d0f30d2a596ad26f36cb67b7b8455f5ce3f9d72 270807: 233b39f8b8b155154cace077078cd4a79312b451 270799: f2f903d6718b7f8d3a6ba329bcfd6346532681f5 270783: ef23f6535df609734631c6279d02140c87ae9417 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8971.c | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 26f33aa26007..e9c5a4e72816 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc45df2dd98cfd550f674c494965f0015d5f923e +refs/heads/master: e46199ece4e0db886f90abe11d91b04601fd0300 diff --git a/trunk/sound/soc/codecs/wm8971.c b/trunk/sound/soc/codecs/wm8971.c index 08ea6f832365..b444b297d0b2 100644 --- a/trunk/sound/soc/codecs/wm8971.c +++ b/trunk/sound/soc/codecs/wm8971.c @@ -546,6 +546,9 @@ static int wm8971_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_PREPARE: break; case SND_SOC_BIAS_STANDBY: + if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) + snd_soc_cache_sync(codec); + /* mute dac and set vmid to 500k, enable VREF */ snd_soc_write(codec, WM8971_PWR1, pwr_reg | 0x0140); break; @@ -605,20 +608,8 @@ static int wm8971_suspend(struct snd_soc_codec *codec, pm_message_t state) static int wm8971_resume(struct snd_soc_codec *codec) { - int i; - u8 data[2]; - u16 *cache = codec->reg_cache; u16 reg; - /* Sync reg_cache with the hardware */ - for (i = 0; i < ARRAY_SIZE(wm8971_reg); i++) { - if (i == WM8971_RESET) - continue; - data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001); - data[1] = cache[i] & 0x00ff; - codec->hw_write(codec->control_data, data, 2); - } - wm8971_set_bias_level(codec, SND_SOC_BIAS_STANDBY); /* charge wm8971 caps */