aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-16 01:57:11 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-17 04:39:44 -0500
commit202a51a8d9c1fddea9eca5953e6e7d7d504a4343 (patch)
tree756021f6f74d5a52638a3816c992131ef4e3af65
parent2ec2a9061dac94ca4c5af13566fe107d84c30d4e (diff)
ASoC: Use standard cache sync code in wm8961
We write the reset register with the default value so it should not be mistakenly written. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/wm8961.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index 8bcc17a61329..4f20c72a0f1d 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -1047,18 +1047,7 @@ static int wm8961_suspend(struct snd_soc_codec *codec)
1047 1047
1048static int wm8961_resume(struct snd_soc_codec *codec) 1048static int wm8961_resume(struct snd_soc_codec *codec)
1049{ 1049{
1050 u16 *reg_cache = codec->reg_cache; 1050 snd_soc_cache_sync(codec);
1051 int i;
1052
1053 for (i = 0; i < codec->driver->reg_cache_size; i++) {
1054 if (reg_cache[i] == wm8961_reg_defaults[i])
1055 continue;
1056
1057 if (i == WM8961_SOFTWARE_RESET)
1058 continue;
1059
1060 snd_soc_write(codec, i, reg_cache[i]);
1061 }
1062 1051
1063 wm8961_set_bias_level(codec, SND_SOC_BIAS_STANDBY); 1052 wm8961_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
1064 1053