summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2015-06-26 10:39:43 +0100
committerMark Brown <broonie@kernel.org>2015-06-26 12:46:55 +0100
commitffacb48e5a4665d3d7286babb38a5af855a36bc0 (patch)
treeafb9f0ec0d5faaa947a4d05d265408c23d95f85d /sound
parent11e688862c4c8162119a4ca51c3326555966c8bb (diff)
downloadlinux-ffacb48e5a4665d3d7286babb38a5af855a36bc0.tar.gz
linux-ffacb48e5a4665d3d7286babb38a5af855a36bc0.tar.bz2
linux-ffacb48e5a4665d3d7286babb38a5af855a36bc0.zip
ASoC: dapm: Fix deadlock on auto-disable mux controls
The commit 02aa78abec6e ("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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-dapm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index aa327c92480c..a47a8ce7a5ea 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -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;