Unverified Commit 68f8043e authored May 29, 2020 by 朱灿灿 Committed by Mark Brown May 29, 2020

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



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>

parent 28ff437a

sound/soc/soc-pcm.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2611,11 +2611,11 @@ 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)
		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);

Admin message