Commit 20244b2a authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown

ASoC: core: Do not cleanup uninitialized dais on soc_pcm_open failure

Introduce for_each_rtd_dais_rollback macro which behaves exactly like
for_each_codec_dais_rollback and its cpu_dais equivalent but for all
dais instead.

Use newly added macro to fix soc_pcm_open error path and prevent
uninitialized dais from being cleaned-up.
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Fixes: 5d9fa03e ("ASoC: soc-pcm: tidyup soc_pcm_open() order")
Acked-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/20200907111939.16169-1-cezary.rojewski@intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6a013710
...@@ -1193,6 +1193,8 @@ struct snd_soc_pcm_runtime { ...@@ -1193,6 +1193,8 @@ struct snd_soc_pcm_runtime {
((i) < (rtd)->num_cpus + (rtd)->num_codecs) && \ ((i) < (rtd)->num_cpus + (rtd)->num_codecs) && \
((dai) = (rtd)->dais[i]); \ ((dai) = (rtd)->dais[i]); \
(i)++) (i)++)
#define for_each_rtd_dais_rollback(rtd, i, dai) \
for (; (--(i) >= 0) && ((dai) = (rtd)->dais[i]);)
void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd); void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd);
......
...@@ -812,7 +812,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) ...@@ -812,7 +812,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
return 0; return 0;
config_err: config_err:
for_each_rtd_dais(rtd, i, dai) for_each_rtd_dais_rollback(rtd, i, dai)
snd_soc_dai_shutdown(dai, substream); snd_soc_dai_shutdown(dai, substream);
snd_soc_link_shutdown(substream); snd_soc_link_shutdown(substream);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment