summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8971.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-10-04 01:44:22 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-04 17:04:30 +0200
commit1a3bbb40da5c01e422309f52475e91886c573718 (patch)
tree7db07d411b631e6110bec752fea82be5497ed489 /sound/soc/codecs/wm8971.c
parentMerge branch 'for-3.1' into for-3.2 (diff)
downloadlinux-1a3bbb40da5c01e422309f52475e91886c573718.tar.xz
linux-1a3bbb40da5c01e422309f52475e91886c573718.zip
ASoC: Avoid writing to WM8971_RESET in wm8971_resume
Writing to WM8971_RESET resets all registers to the default state. Thus we should avoid writing to WM8971_RESET on resume. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8971.c')
-rw-r--r--sound/soc/codecs/wm8971.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index ce33a94b6aad..08ea6f832365 100644
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -612,7 +612,7 @@ static int wm8971_resume(struct snd_soc_codec *codec)
/* Sync reg_cache with the hardware */
for (i = 0; i < ARRAY_SIZE(wm8971_reg); i++) {
- if (i + 1 == WM8971_RESET)
+ if (i == WM8971_RESET)
continue;
data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001);
data[1] = cache[i] & 0x00ff;