Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

parents 8ef2292e a14d9829

sound/soc/codecs/sta32x.c

+6 −4
Original line number Diff line number Diff line
@@ -363,7 +363,8 @@ static void sta32x_watchdog(struct work_struct *work) 
	}



	if (!sta32x->shutdown)

		schedule_delayed_work(&sta32x->watchdog_work,

		queue_delayed_work(system_power_efficient_wq,

				   &sta32x->watchdog_work,

				   round_jiffies_relative(HZ));

}
@@ -371,7 +372,8 @@ static void sta32x_watchdog_start(struct sta32x_priv *sta32x) 
{

	if (sta32x->pdata->needs_esd_watchdog) {

		sta32x->shutdown = 0;

		schedule_delayed_work(&sta32x->watchdog_work,

		queue_delayed_work(system_power_efficient_wq,

				   &sta32x->watchdog_work,

				   round_jiffies_relative(HZ));

	}

}