Commit e82ebffc authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: soc-pcm: don't use bit-OR'ed error

Current soc-pcm is using bit-OR'ed error

	ret |= snd_soc_component_close(component, substream);
	ret |= snd_soc_component_hw_free(component, substream);

The driver may return arbitrary error codes so they can conflict.
The bit-OR'ed error works only if the return code is always consistent.
This patch fixup it, and use *last* ret value.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/877e0vceyc.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 09e88f8a
...@@ -498,13 +498,16 @@ static int soc_pcm_components_close(struct snd_pcm_substream *substream, ...@@ -498,13 +498,16 @@ static int soc_pcm_components_close(struct snd_pcm_substream *substream,
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_component *component; struct snd_soc_component *component;
int i, ret = 0; int i, r, ret = 0;
for_each_rtd_components(rtd, i, component) { for_each_rtd_components(rtd, i, component) {
if (component == last) if (component == last)
break; break;
ret |= snd_soc_component_close(component, substream); r = snd_soc_component_close(component, substream);
if (r < 0)
ret = r; /* use last ret */
snd_soc_component_module_put_when_close(component); snd_soc_component_module_put_when_close(component);
} }
...@@ -798,13 +801,15 @@ static int soc_pcm_components_hw_free(struct snd_pcm_substream *substream, ...@@ -798,13 +801,15 @@ static int soc_pcm_components_hw_free(struct snd_pcm_substream *substream,
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_component *component; struct snd_soc_component *component;
int i, ret = 0; int i, r, ret = 0;
for_each_rtd_components(rtd, i, component) { for_each_rtd_components(rtd, i, component) {
if (component == last) if (component == last)
break; break;
ret |= snd_soc_component_hw_free(component, substream); r = snd_soc_component_hw_free(component, substream);
if (r < 0)
ret = r; /* use last ret */
} }
return ret; return ret;
......
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