]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ASoC: dapm: dapm_dai_get_connected_widgets: Fix missing mutex unlock
authorLars-Peter Clausen <lars@metafoo.de>
Tue, 11 Aug 2015 19:37:59 +0000 (21:37 +0200)
committerMark Brown <broonie@kernel.org>
Thu, 13 Aug 2015 11:40:16 +0000 (12:40 +0100)
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: 1ce43acff0c0 ("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>
sound/soc/soc-dapm.c

index ac506cfb9ed20b8486717aa21f9852574f380b87..fa09108047c8b09c36c04a25bd80a35a465dfc8c 100644 (file)
@@ -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);
        if (ret)
-               return ret;
+               paths = ret;
 
        trace_snd_soc_dapm_connected(paths, stream);
        mutex_unlock(&card->dapm_mutex);