diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-24 15:38:26 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-24 15:38:26 +0100 |
| commit | 0e2b1708419584d3c1cff8e791c10c84b026c419 (patch) | |
| tree | 7b551dd6976a38f52dec6a1614c056d4cc3b27a2 /sound | |
| parent | a360516b0aecbd9570edbbb39d5adc8db43aa1d7 (diff) | |
| parent | a14d982962c1c3caee99ddeea632d97fc851ea60 (diff) | |
Merge remote-tracking branch 'asoc/topic/sta32x' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/sta32x.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c index cfb55fe35e98..06edb396e733 100644 --- a/sound/soc/codecs/sta32x.c +++ b/sound/soc/codecs/sta32x.c @@ -363,16 +363,18 @@ static void sta32x_watchdog(struct work_struct *work) } if (!sta32x->shutdown) - schedule_delayed_work(&sta32x->watchdog_work, - round_jiffies_relative(HZ)); + queue_delayed_work(system_power_efficient_wq, + &sta32x->watchdog_work, + round_jiffies_relative(HZ)); } static void sta32x_watchdog_start(struct sta32x_priv *sta32x) { if (sta32x->pdata->needs_esd_watchdog) { sta32x->shutdown = 0; - schedule_delayed_work(&sta32x->watchdog_work, - round_jiffies_relative(HZ)); + queue_delayed_work(system_power_efficient_wq, + &sta32x->watchdog_work, + round_jiffies_relative(HZ)); } } |