summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-22 14:28:51 +0100
committerMark Brown <broonie@linaro.org>2013-08-22 14:28:51 +0100
commit049d41409d7089a7a128950231642055b963f0e4 (patch)
treeb429984fc589be87e50de205a2385cee475c1770
parent8ef2292edbe50c432c5aa816e8add7d2ce6e894c (diff)
parenta14d982962c1c3caee99ddeea632d97fc851ea60 (diff)
downloadop-kernel-dev-049d41409d7089a7a128950231642055b963f0e4.zip
op-kernel-dev-049d41409d7089a7a128950231642055b963f0e4.tar.gz
Merge remote-tracking branch 'asoc/topic/sta32x' into asoc-next
-rw-r--r--sound/soc/codecs/sta32x.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
index cfb55fe..06edb39 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));
}
}
OpenPOWER on IntegriCloud