aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-22 09:28:58 -0400
committerMark Brown <broonie@linaro.org>2013-08-22 09:28:58 -0400
commit2cb852b52d8c8b54233c7c16d3cf0895e60f8ef8 (patch)
tree28d5255d82c3d28f23f281facdd1e94c1669e56d
parent662295940bc78733432b72a2495ac5f98886cd93 (diff)
parent2c5920a787e68e0a61886d24b05cdbde344c4b0c (diff)
Merge remote-tracking branch 'asoc/topic/wm8350' into asoc-next
-rw-r--r--sound/soc/codecs/wm8350.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 0e8b3aaf6c8d..af1318ddb062 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)
1301 if (device_may_wakeup(wm8350->dev)) 1301 if (device_may_wakeup(wm8350->dev))
1302 pm_wakeup_event(wm8350->dev, 250); 1302 pm_wakeup_event(wm8350->dev, 250);
1303 1303
1304 schedule_delayed_work(&priv->hpl.work, msecs_to_jiffies(200)); 1304 queue_delayed_work(system_power_efficient_wq,
1305 &priv->hpl.work, msecs_to_jiffies(200));
1305 1306
1306 return IRQ_HANDLED; 1307 return IRQ_HANDLED;
1307} 1308}
@@ -1318,7 +1319,8 @@ static irqreturn_t wm8350_hpr_jack_handler(int irq, void *data)
1318 if (device_may_wakeup(wm8350->dev)) 1319 if (device_may_wakeup(wm8350->dev))
1319 pm_wakeup_event(wm8350->dev, 250); 1320 pm_wakeup_event(wm8350->dev, 250);
1320 1321
1321 schedule_delayed_work(&priv->hpr.work, msecs_to_jiffies(200)); 1322 queue_delayed_work(system_power_efficient_wq,
1323 &priv->hpr.work, msecs_to_jiffies(200));
1322 1324
1323 return IRQ_HANDLED; 1325 return IRQ_HANDLED;
1324} 1326}