summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm8961.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-03-01 12:38:59 +0100
committerTakashi Iwai <tiwai@suse.de>2010-03-01 12:38:59 +0100
commit6679ee1870f7ccdd48e2e5c57919240b8f19a6dc (patch)
tree225ed7efcc0bb7e3c90233576c6106538e17a275 /sound/soc/codecs/wm8961.c
parenta91a4aa1ee994abeb2190a1bb2f703933609a703 (diff)
parenta0b62329bb290c10d7278809af910ed115768991 (diff)
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/wm8961.c')
-rw-r--r--sound/soc/codecs/wm8961.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index a8007d58813f..d2342c5e0425 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -1022,6 +1022,9 @@ static int wm8961_resume(struct platform_device *pdev)
int i;
for (i = 0; i < codec->reg_cache_size; i++) {
+ if (reg_cache[i] == wm8961_reg_defaults[i])
+ continue;
+
if (i == WM8961_SOFTWARE_RESET)
continue;