summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm8903.c
diff options
context:
space:
mode:
authorJoseph Lo <josephl@nvidia.com>2012-04-16 14:02:57 +0800
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-04-17 01:35:38 -0700
commitafed1926614d18148d933888cf13d9490d8208be (patch)
tree71e90c9a53ec4aa8f30b5ea5a5f366bdedd4687b /sound/soc/codecs/wm8903.c
parent2448046921f3b7c3bdb9c29d9b000bd6e939cae3 (diff)
ASoC: WM8903: fix the resume sequence
The bias control must be done after the default register value been restored. Bug 964400 Change-Id: Iefbd96506573d5ea0e1b3123bb34c38e34e75068 Signed-off-by: Joseph Lo <josephl@nvidia.com> Reviewed-on: http://git-master/r/96658 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'sound/soc/codecs/wm8903.c')
-rw-r--r--sound/soc/codecs/wm8903.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index 0218d6ce0557..df4d0ee6f975 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -1778,9 +1778,6 @@ static int wm8903_resume(struct snd_soc_codec *codec)
if (wm8903->irq)
enable_irq(wm8903->irq);
- /* Bring the codec back up to standby first to minimise pop/clicks */
- wm8903_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
/* Sync back everything else */
if (tmp_cache) {
for (i = 2; i < ARRAY_SIZE(wm8903_reg_defaults); i++)
@@ -1791,6 +1788,9 @@ static int wm8903_resume(struct snd_soc_codec *codec)
dev_err(codec->dev, "Failed to allocate temporary cache\n");
}
+ /* Bring the codec back up to standby first to minimise pop/clicks */
+ wm8903_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+
return 0;
}