git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
sound
/
soc
/
codecs
/
wm8510.c
diff --git
a/sound/soc/codecs/wm8510.c
b/sound/soc/codecs/wm8510.c
index
9000b1d
..
0f7bcb6
100644
(file)
--- a/
sound/soc/codecs/wm8510.c
+++ b/
sound/soc/codecs/wm8510.c
@@
-557,7
+557,7
@@
static int wm8510_resume(struct platform_device *pdev)
codec->hw_write(codec->control_data, data, 2);
}
wm8510_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
- wm8510_set_bias_level(codec, codec->suspend_bias_level);
+
return 0;
}