diff options
| author | Qiao Zhou <zhouqiao@marvell.com> | 2014-09-12 03:41:31 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-24 12:38:55 +0200 |
| commit | 2e4ec1c0b8791f3556576a19cf56941c3d2a90fc (patch) | |
| tree | 3fe993cc4e5e8dd71a0ac1a42dceae8cc660bd7a | |
| parent | Linux 3.17-rc6 (diff) | |
| download | linux-2e4ec1c0b8791f3556576a19cf56941c3d2a90fc.tar.xz linux-2e4ec1c0b8791f3556576a19cf56941c3d2a90fc.zip | |
ASoC: soc-compress: fix double unlock of fe card mutex
Fix double unlock of fe card mutex introduced by patch 8f70e515a8bb
"ASoC: soc-pcm: fix dpcm_path_get error handling"
The first unlock is at line 106, and the unlock is at line 149. we
should remove the first unlock.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Qiao Zhou <zhouqiao@marvell.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/soc-compress.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 3092b58fede6..cecfab3cc948 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -102,13 +102,11 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) fe->dpcm[stream].runtime = fe_substream->runtime; ret = dpcm_path_get(fe, stream, &list); - if (ret < 0) { - mutex_unlock(&fe->card->mutex); + if (ret < 0) goto fe_err; - } else if (ret == 0) { + else if (ret == 0) dev_dbg(fe->dev, "ASoC: %s no valid %s route\n", fe->dai_link->name, stream ? "capture" : "playback"); - } /* calculate valid and active FE <-> BE dpcms */ dpcm_process_paths(fe, stream, &list, 1); |