aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-22 09:28:59 -0400
committerMark Brown <broonie@linaro.org>2013-08-22 09:28:59 -0400
commita2e4b255c0633dc4f2356df9cbb9af3dfa49fc73 (patch)
treea2517770b29950056beadd910f314eac1c6d67d4 /sound/soc/codecs
parent0b05a05def144aec720394496f3dd47c8b7f796a (diff)
parent3ce1fb524a777bd9c2b02a298bbc96f0df46a78e (diff)
Merge remote-tracking branch 'asoc/topic/wm8753' into asoc-next
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm8753.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 0a4ab4c423d1..d96ebf52d953 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -1456,8 +1456,9 @@ static int wm8753_resume(struct snd_soc_codec *codec)
1456 if (codec->dapm.suspend_bias_level == SND_SOC_BIAS_ON) { 1456 if (codec->dapm.suspend_bias_level == SND_SOC_BIAS_ON) {
1457 wm8753_set_bias_level(codec, SND_SOC_BIAS_PREPARE); 1457 wm8753_set_bias_level(codec, SND_SOC_BIAS_PREPARE);
1458 codec->dapm.bias_level = SND_SOC_BIAS_ON; 1458 codec->dapm.bias_level = SND_SOC_BIAS_ON;
1459 schedule_delayed_work(&codec->dapm.delayed_work, 1459 queue_delayed_work(system_power_efficient_wq,
1460 msecs_to_jiffies(caps_charge)); 1460 &codec->dapm.delayed_work,
1461 msecs_to_jiffies(caps_charge));
1461 } 1462 }
1462 1463
1463 return 0; 1464 return 0;