Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e4ec1c0 authored by Qiao Zhou's avatar Qiao Zhou Committed by Mark Brown
Browse files

ASoC: soc-compress: fix double unlock of fe card mutex 



Fix double unlock of fe card mutex introduced by patch 8f70e515
"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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarQiao Zhou <zhouqiao@marvell.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0f33be00

sound/soc/soc-compress.c

+2 −4
Original line number Diff line number Diff line
@@ -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);