summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-30 18:24:19 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-09 08:31:52 -0700
commit9966af8a7ac83cdc9aa5a054e843fdecc6689aa0 (patch)
tree0c0b7ff266c232795f1639e128bd73df9b486568 /sound
parent7dcb3c5de76a8516e7f2391dfbab2727f69ed010 (diff)
downloadlinux-3.10-9966af8a7ac83cdc9aa5a054e843fdecc6689aa0.tar.gz
linux-3.10-9966af8a7ac83cdc9aa5a054e843fdecc6689aa0.tar.bz2
linux-3.10-9966af8a7ac83cdc9aa5a054e843fdecc6689aa0.zip
ASoC: wm8962: Allow VMID time to fully ramp
commit 9d40e5582c9c4cfb6977ba2a0ca9c2ed82c56f21 upstream. Required for reliable power up from cold. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 08850f8fdb5..96f6f9faa82 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2488,6 +2488,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: