summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/nau8825.c
diff options
context:
space:
mode:
authorMark Brown2018-01-12 19:59:19 +0100
committerMark Brown2018-01-12 19:59:19 +0100
commit9d66a875ecc7d6dd414121e4508340d6c08f51b0 (patch)
treed446bb455780d9058efe1760745bfb63207090de /sound/soc/codecs/nau8825.c
parentASoC: sn95031: remove this code (diff)
parentgpio: merrifield: Add support of ACPI enabled platforms (diff)
downloadkernel-qcow2-linux-9d66a875ecc7d6dd414121e4508340d6c08f51b0.tar.gz
kernel-qcow2-linux-9d66a875ecc7d6dd414121e4508340d6c08f51b0.tar.xz
kernel-qcow2-linux-9d66a875ecc7d6dd414121e4508340d6c08f51b0.zip
Merge branch 'acpi-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into asoc-intel
Diffstat (limited to 'sound/soc/codecs/nau8825.c')
-rw-r--r--sound/soc/codecs/nau8825.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c
index 714ce17da717..e853a6dfd33b 100644
--- a/sound/soc/codecs/nau8825.c
+++ b/sound/soc/codecs/nau8825.c
@@ -905,6 +905,7 @@ static int nau8825_adc_event(struct snd_soc_dapm_widget *w,
switch (event) {
case SND_SOC_DAPM_POST_PMU:
+ msleep(125);
regmap_update_bits(nau8825->regmap, NAU8825_REG_ENA_CTRL,
NAU8825_ENABLE_ADC, NAU8825_ENABLE_ADC);
break;