diff options
| author | Shengjiu Wang <shengjiu.wang@nxp.com> | 2019-11-12 18:46:42 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-11-20 17:16:27 +0000 |
| commit | 5cca59516de5df9de6bdecb328dd55fb5bcccb41 (patch) | |
| tree | b74d83e539eba2c4299142089697514ae8841ee6 /sound | |
| parent | 4ec48e7cbe6e70352c802b5cb172b00ebd8af8e0 (diff) | |
| download | linux-stable-5cca59516de5df9de6bdecb328dd55fb5bcccb41.tar.gz linux-stable-5cca59516de5df9de6bdecb328dd55fb5bcccb41.tar.bz2 linux-stable-5cca59516de5df9de6bdecb328dd55fb5bcccb41.zip | |
ASoC: soc-pcm: check symmetry before hw_params
This reverts commit 957ce0c6b8a1f (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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-pcm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 2c4f50c44591..01eb8700c3de 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -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; |