Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit f47b9ad9 authored by Jerome Brunet's avatar Jerome Brunet Committed by Mark Brown
Browse files

ASoC: skip hw_free on codec dai for which the stream is invalid 



Like for hw_params, hw_free should not be called on codec dai for
which the current stream is invalid.

Fixes: cde79035 ("ASoC: Handle multiple codecs with split playback / capture")
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6a7c59c6

sound/soc/soc-pcm.c

+6 −0
Original line number Diff line number Diff line
@@ -1031,6 +1031,9 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, 


codec_err:

	for_each_rtd_codec_dai_rollback(rtd, i, codec_dai) {

		if (!snd_soc_dai_stream_valid(codec_dai, substream->stream))

			continue;



		if (codec_dai->driver->ops->hw_free)

			codec_dai->driver->ops->hw_free(substream, codec_dai);

		codec_dai->rate = 0;
@@ -1088,6 +1091,9 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream) 


	/* now free hw params for the DAIs  */

	for_each_rtd_codec_dai(rtd, i, codec_dai) {

		if (!snd_soc_dai_stream_valid(codec_dai, substream->stream))

			continue;



		if (codec_dai->driver->ops->hw_free)

			codec_dai->driver->ops->hw_free(substream, codec_dai);

	}