Commit 964a0b89 authored May 08, 2015 by Charles Keepax Committed by Mark Brown May 08, 2015

ASoC: dapm: Add missing mutex unlock



The is a missing mutex unlock on the error path in
snd_soc_dapm_get_enum_double. This was introduced in commit
561ed680 ("ASoC: dapm: Add support for autodisable mux controls").
This patch adds the missing unlock.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent d714f97c

sound/soc/soc-dapm.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -3069,8 +3069,10 @@ int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol,
		mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
		if (e->reg != SND_SOC_NOPM && dapm_kcontrol_is_powered(kcontrol)) {
		int ret = soc_dapm_read(dapm, e->reg, &reg_val);
		if (ret)
		if (ret) {
		mutex_unlock(&card->dapm_mutex);
		return ret;
		}
		} else {
		reg_val = dapm_kcontrol_get_value(kcontrol);
		}

Admin message