Commit 30abbe77 authored Aug 11, 2015 by Lars-Peter Clausen Committed by Mark Brown Aug 13, 2015

ASoC: dapm: dapm_dai_get_connected_widgets: Fix missing mutex unlock

Make sure to unlock the DAPM mutex when dapm_widget_list_create() fails.

This means the function will now generate a trace_snd_soc_dapm_connected
event, even if the creation of the list fails. But that was the behavior
before the patch that introduced the unlock issue, so that should be fine.

Fixes: 1ce43acf ("ASoC: dapm: Simplify list creation in dapm_dai_get_connected_widgets()")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent e63bfd45

sound/soc/soc-dapm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1191,7 +1191,7 @@ int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,

	ret = dapm_widget_list_create(list, &widgets);		ret = dapm_widget_list_create(list, &widgets);
	if (ret)		if (ret)
	return ret;		paths = ret;

	trace_snd_soc_dapm_connected(paths, stream);		trace_snd_soc_dapm_connected(paths, stream);
	mutex_unlock(&card->dapm_mutex);		mutex_unlock(&card->dapm_mutex);