Unverified Commit 5cca5951 authored Nov 12, 2019 by Shengjiu Wang Committed by Mark Brown Nov 20, 2019

ASoC: soc-pcm: check symmetry before hw_params



This reverts commit 957ce0c6 (ASoC: soc-pcm: check symmetry after
hw_params).

That commit cause soc_pcm_params_symmetry can't take effect.
cpu_dai->rate, cpu_dai->channels and cpu_dai->sample_bits
are updated in the middle of soc_pcm_hw_params, so move
soc_pcm_params_symmetry to the end of soc_pcm_hw_params is
not a good solution, for judgement of symmetry in the function
is always true.

FIXME:
According to the comments of that commit, I think the case
described in the commit should disable symmetric_rates
in Back-End, rather than changing the position of
soc_pcm_params_symmetry.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Link: https://lore.kernel.org/r/1573555602-5403-1-git-send-email-shengjiu.wang@nxp.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 4ec48e7c

sound/soc/soc-pcm.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -861,6 +861,11 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
		int i, ret = 0;

		mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);

		ret = soc_pcm_params_symmetry(substream, params);
		if (ret)
		goto out;

		if (rtd->dai_link->ops->hw_params) {
		ret = rtd->dai_link->ops->hw_params(substream, params);
		if (ret < 0) {
		@@ -940,9 +945,6 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
		}
		component = NULL;

		ret = soc_pcm_params_symmetry(substream, params);
		if (ret)
		goto component_err;
		out:
		mutex_unlock(&rtd->card->pcm_mutex);
		return ret;

Admin message