Commit ffacb48e authored Jun 26, 2015 by Charles Keepax Committed by Mark Brown Jun 26, 2015

ASoC: dapm: Fix deadlock on auto-disable mux controls



The commit 02aa78ab ("ASoC: DAPM: Add APIs to create individual DAPM
controls.") added locking to the snd_soc_dapm_new_control function but
did not update the call to snd_soc_dapm_new_control in the auto-disable
mux code, this appears to be because the patches were sent at fairly
similar times.

This patch change the call in the auto-disable mux code to use the new
snd_soc_dapm_new_control_unlocked function instead.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 11e68886

sound/soc/soc-dapm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -389,8 +389,8 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget,

		data->value = template.on_val;

		data->widget = snd_soc_dapm_new_control(widget->dapm,
		&template);
		data->widget = snd_soc_dapm_new_control_unlocked(
		widget->dapm, &template);
		if (!data->widget) {
		ret = -ENOMEM;
		goto err_name;

Admin message