diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-08-11 21:37:59 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-13 12:40:16 +0100 |
| commit | 30abbe7727b23c6661daeea5d36be36ed7a41665 (patch) | |
| tree | f472a4c01e7020e0b5c58e0e61d8efbd386543e5 /sound/soc/soc-dapm.c | |
| parent | e63bfd45aba4269811662de0954785622a2ac928 (diff) | |
| download | linux-stable-30abbe7727b23c6661daeea5d36be36ed7a41665.tar.gz linux-stable-30abbe7727b23c6661daeea5d36be36ed7a41665.tar.bz2 linux-stable-30abbe7727b23c6661daeea5d36be36ed7a41665.zip | |
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: 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>
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index ac506cfb9ed2..fa09108047c8 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -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); |