Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-27 07:16:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/877e0vceyc.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2020-02-10 12:14:26 +09:00 committed by Mark Brown
parent 09e88f8a5c
commit e82ebffce3
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/soc-pcm.c
View File

@ -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_component *component;
int i, ret = 0;
int i, r, ret = 0;
for_each_rtd_components(rtd, i, component) {
if (component == last)
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);
}
@ -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_component *component;
int i, ret = 0;
int i, r, ret = 0;
for_each_rtd_components(rtd, i, component) {
if (component == last)
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;