diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:58 +0100 |
| commit | 2cb852b52d8c8b54233c7c16d3cf0895e60f8ef8 (patch) | |
| tree | 28d5255d82c3d28f23f281facdd1e94c1669e56d /sound/soc/codecs | |
| parent | 662295940bc78733432b72a2495ac5f98886cd93 (diff) | |
| parent | 2c5920a787e68e0a61886d24b05cdbde344c4b0c (diff) | |
| download | op-kernel-dev-2cb852b52d8c8b54233c7c16d3cf0895e60f8ef8.zip op-kernel-dev-2cb852b52d8c8b54233c7c16d3cf0895e60f8ef8.tar.gz | |
Merge remote-tracking branch 'asoc/topic/wm8350' into asoc-next
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/wm8350.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 0e8b3aa..af1318d 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c @@ -1301,7 +1301,8 @@ static irqreturn_t wm8350_hpl_jack_handler(int irq, void *data) if (device_may_wakeup(wm8350->dev)) pm_wakeup_event(wm8350->dev, 250); - schedule_delayed_work(&priv->hpl.work, msecs_to_jiffies(200)); + queue_delayed_work(system_power_efficient_wq, + &priv->hpl.work, msecs_to_jiffies(200)); return IRQ_HANDLED; } @@ -1318,7 +1319,8 @@ static irqreturn_t wm8350_hpr_jack_handler(int irq, void *data) if (device_may_wakeup(wm8350->dev)) pm_wakeup_event(wm8350->dev, 250); - schedule_delayed_work(&priv->hpr.work, msecs_to_jiffies(200)); + queue_delayed_work(system_power_efficient_wq, + &priv->hpr.work, msecs_to_jiffies(200)); return IRQ_HANDLED; } |
