diff options
| author | Jerome Brunet <jbrunet@baylibre.com> | 2019-04-29 11:47:50 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-03 07:52:31 +0200 |
| commit | f47b9ad927c6370b80922af434dda98764a43804 (patch) | |
| tree | e68aa6e2ed9f287e4820b96f36780957a251e996 /sound/soc/soc-pcm.c | |
| parent | ASoC: fix valid stream condition (diff) | |
| download | linux-f47b9ad927c6370b80922af434dda98764a43804.tar.xz linux-f47b9ad927c6370b80922af434dda98764a43804.zip | |
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: cde79035c6cf ("ASoC: Handle multiple codecs with split playback / capture")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 57088bd69e5d..a810f6eeffee 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1031,6 +1031,9 @@ interface_err: 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); } |