Subject: [PATCH v2] ASoC: soc-pcm: fix BE dai not hw_free and shutdown during mixer...

FE state is SND_SOC_DPCM_STATE_PREPARE now, BE1 is
used by FE.

Later when new BE2 is added to FE by mixer update,
it will call dpcm_run_update_startup() to update
BE2's state, but unfortunately BE2 .prepare() meets
error, it will disconnect all non started BE.

This make BE1 dai skip .hw_free() and .shutdown(),
and the BE1 users will never decrease to zero.

Signed-off-by: zhucancan <zhucancan@vivo.com>
Link: https://lore.kernel.org/r/ALMAWwB5CP9aAcKXCU5FzqqF.1.1590747164172.Hmail.zhucancan@vivo.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 80dd3cf6200c1ee29e54a52b475812595c19cf5f..276505fb9d50408a3a6470b569b164ad39002ba3 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2611,12 +2611,12 @@ hw_free:
 close:
        dpcm_be_dai_shutdown(fe, stream);
 disconnect:
-       /* disconnect any non started BEs */
+       /* disconnect any closed BEs */
        spin_lock_irqsave(&fe->card->dpcm_lock, flags);
        for_each_dpcm_be(fe, stream, dpcm) {
                struct snd_soc_pcm_runtime *be = dpcm->be;
-               if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_START)
-                               dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE;
+               if (be->dpcm[stream].state == SND_SOC_DPCM_STATE_CLOSE)
+                       dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE;
        }
        spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);