Unverified Commit 5c25bd64 authored Feb 10, 2020 by Kuninori Morimoto Committed by Mark Brown Feb 11, 2020

ASoC: soc-pcm: adjustment for DAI member 0 reset



commit 3635bf09 ("ASoC: soc-pcm: add symmetry for channels and
sample bits") set 0 not only to dai->rate but also to dai->channels and
dai->sample_bits if DAI was not active at soc_pcm_close().

and

commit d3383420 ("ASoC: soc-pcm: move DAIs parameters cleaning into
hw_free()") moved it from soc_pcm_close() to soc_pcm_hw_free().

These happen at v3.14.
But, maybe because of branch merge conflict or something similar happen
then, soc_pcm_close() still has old settings
(care only dai->rate, doesn't care dai->channels/sample_bits).
This is 100% duplicated operation.

This patch removes soc_pcm_close() side operation which supposed to
already moved to soc_pcm_hw_free().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87a75rceyl.wl-kuninori.morimoto.gx@renesas.com


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

parent 7a5aaba4

sound/soc/soc-pcm.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -687,15 +687,6 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)

		snd_soc_runtime_deactivate(rtd, substream->stream);

		/* clear the corresponding DAIs rate when inactive */
		if (!cpu_dai->active)
		cpu_dai->rate = 0;

		for_each_rtd_codec_dai(rtd, i, codec_dai) {
		if (!codec_dai->active)
		codec_dai->rate = 0;
		}

		snd_soc_dai_digital_mute(cpu_dai, 1, substream->stream);

		snd_soc_dai_shutdown(cpu_dai, substream);

Admin message