summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-30 19:24:19 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-31 20:30:24 +0200
commit9d40e5582c9c4cfb6977ba2a0ca9c2ed82c56f21 (patch)
tree8416f0e13f6830c85d841881d1aba251719d51a1 /sound
parentASoC: AC97 doesn't use regmap by default (diff)
downloadlinux-9d40e5582c9c4cfb6977ba2a0ca9c2ed82c56f21.tar.xz
linux-9d40e5582c9c4cfb6977ba2a0ca9c2ed82c56f21.zip
ASoC: wm8962: Allow VMID time to fully ramp
Required for reliable power up from cold. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8962.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index eaf65863ec21..aa9ce9dd7d8a 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2501,6 +2501,9 @@ static int wm8962_set_bias_level(struct snd_soc_codec *codec,
/* VMID 2*250k */
snd_soc_update_bits(codec, WM8962_PWR_MGMT_1,
WM8962_VMID_SEL_MASK, 0x100);
+
+ if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
+ msleep(100);
break;
case SND_SOC_BIAS_OFF: