From: yixuanjiang Date: Mon, 19 Jun 2023 03:31:27 +0000 (+0800) Subject: ASoC: soc-compress: Fix deadlock in soc_compr_open_fe X-Git-Tag: v6.6-rc1~135^2~1^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2222214749a9969e09454b9ba7febfdfb09c1c8d;p=thirdparty%2Fkernel%2Flinux.git ASoC: soc-compress: Fix deadlock in soc_compr_open_fe Modify the error handling flow by release lock. The require mutex will keep holding if open fail. Fixes: aa9ff6a4955f ("ASoC: soc-compress: Reposition and add pcm_mutex") Signed-off-by: yixuanjiang Link: https://lore.kernel.org/r/20230619033127.2522477-1-yixuanjiang@google.com Signed-off-by: Mark Brown --- diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index d8715db5e415e..2117fd61cf8f3 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -194,6 +194,7 @@ open_err: snd_soc_dai_compr_shutdown(cpu_dai, cstream, 1); out: dpcm_path_put(&list); + snd_soc_dpcm_mutex_unlock(fe); be_err: fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO; snd_soc_card_mutex_unlock(fe->card);