diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 17:28:41 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 17:28:41 +0400 |
| commit | 588701efbd49f11353d67240aead35724cff8753 (patch) | |
| tree | 039abeca12b469c12cba5b55651f13b8390837d5 | |
| parent | ffdcb88b80a02602570227e6935583c4ad804cbe (diff) | |
| parent | 2df7c6aad63f432befe51ac3144a96b37fa5b4ba (diff) | |
| download | linux-588701efbd49f11353d67240aead35724cff8753.tar.xz | |
Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next
| -rw-r--r-- | sound/soc/codecs/max98090.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index ad5313f98f28..0569a4c3ae00 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -2084,8 +2084,9 @@ static irqreturn_t max98090_interrupt(int irq, void *data) pm_wakeup_event(codec->dev, 100); - schedule_delayed_work(&max98090->jack_work, - msecs_to_jiffies(100)); + queue_delayed_work(system_power_efficient_wq, + &max98090->jack_work, + msecs_to_jiffies(100)); } if (active & M98090_DRCACT_MASK) @@ -2132,8 +2133,9 @@ int max98090_mic_detect(struct snd_soc_codec *codec, snd_soc_jack_report(max98090->jack, 0, SND_JACK_HEADSET | SND_JACK_BTN_0); - schedule_delayed_work(&max98090->jack_work, - msecs_to_jiffies(100)); + queue_delayed_work(system_power_efficient_wq, + &max98090->jack_work, + msecs_to_jiffies(100)); return 0; } |