mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-07 17:19:02 +00:00
Merge remote-tracking branch 'asoc/topic/sta32x' into asoc-next
This commit is contained in:
commit
049d41409d
1 changed files with 6 additions and 4 deletions
|
@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue