Commit 049d4140 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'asoc/topic/sta32x' into asoc-next

parents 8ef2292e a14d9829
...@@ -363,16 +363,18 @@ static void sta32x_watchdog(struct work_struct *work) ...@@ -363,16 +363,18 @@ static void sta32x_watchdog(struct work_struct *work)
} }
if (!sta32x->shutdown) if (!sta32x->shutdown)
schedule_delayed_work(&sta32x->watchdog_work, queue_delayed_work(system_power_efficient_wq,
round_jiffies_relative(HZ)); &sta32x->watchdog_work,
round_jiffies_relative(HZ));
} }
static void sta32x_watchdog_start(struct sta32x_priv *sta32x) static void sta32x_watchdog_start(struct sta32x_priv *sta32x)
{ {
if (sta32x->pdata->needs_esd_watchdog) { if (sta32x->pdata->needs_esd_watchdog) {
sta32x->shutdown = 0; sta32x->shutdown = 0;
schedule_delayed_work(&sta32x->watchdog_work, queue_delayed_work(system_power_efficient_wq,
round_jiffies_relative(HZ)); &sta32x->watchdog_work,
round_jiffies_relative(HZ));
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment