diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:59 +0100 |
| commit | a2e4b255c0633dc4f2356df9cbb9af3dfa49fc73 (patch) | |
| tree | a2517770b29950056beadd910f314eac1c6d67d4 /sound | |
| parent | 0b05a05def144aec720394496f3dd47c8b7f796a (diff) | |
| parent | 3ce1fb524a777bd9c2b02a298bbc96f0df46a78e (diff) | |
| download | op-kernel-dev-a2e4b255c0633dc4f2356df9cbb9af3dfa49fc73.zip op-kernel-dev-a2e4b255c0633dc4f2356df9cbb9af3dfa49fc73.tar.gz | |
Merge remote-tracking branch 'asoc/topic/wm8753' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8753.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 0a4ab4c..d96ebf5 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) if (codec->dapm.suspend_bias_level == SND_SOC_BIAS_ON) { wm8753_set_bias_level(codec, SND_SOC_BIAS_PREPARE); codec->dapm.bias_level = SND_SOC_BIAS_ON; - schedule_delayed_work(&codec->dapm.delayed_work, - msecs_to_jiffies(caps_charge)); + queue_delayed_work(system_power_efficient_wq, + &codec->dapm.delayed_work, + msecs_to_jiffies(caps_charge)); } return 0; |
