p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ALSA: pcm: Set config update bits only when really changed 

The PCM config space refine codes touch the parameter rmask and cmask
bits when the given config parameter is changed.  But in most places
it checks only whether the changed value is non-zero or not, and they
don't consider whether a negative error value is returned.  This will
lead to the incorrect update bits set upon the error path.

Fix the codes to check properly the return code whether it's really
updated or an error.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2018-01-02 11:00:57 +01:00
parent c1350bff69
commit 7a0a87160a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/core/oss/pcm_oss.c
View File

@ -186,7 +186,7 @@ static int _snd_pcm_hw_param_mask(struct snd_pcm_hw_params *params,
{ {
int changed; int changed;
changed = snd_mask_refine(hw_param_mask(params, var), val); changed = snd_mask_refine(hw_param_mask(params, var), val);
if (changed) { if (changed > 0) {
params->cmask |= 1 << var; params->cmask |= 1 << var;
params->rmask |= 1 << var; params->rmask |= 1 << var;
} }
@ -233,7 +233,7 @@ static int _snd_pcm_hw_param_min(struct snd_pcm_hw_params *params,
val, open); val, open);
else else
return -EINVAL; return -EINVAL;
if (changed) { if (changed > 0) {
params->cmask |= 1 << var; params->cmask |= 1 << var;
params->rmask |= 1 << var; params->rmask |= 1 << var;
} }
@ -294,7 +294,7 @@ static int _snd_pcm_hw_param_max(struct snd_pcm_hw_params *params,
val, open); val, open);
else else
return -EINVAL; return -EINVAL;
if (changed) { if (changed > 0) {
params->cmask |= 1 << var; params->cmask |= 1 << var;
params->rmask |= 1 << var; params->rmask |= 1 << var;
} }
@ -500,7 +500,7 @@ static int _snd_pcm_hw_param_set(struct snd_pcm_hw_params *params,
} }
} else } else
return -EINVAL; return -EINVAL;
if (changed) { if (changed > 0) {
params->cmask |= 1 << var; params->cmask |= 1 << var;
params->rmask |= 1 << var; params->rmask |= 1 << var;
} }
@ -540,7 +540,7 @@ static int _snd_pcm_hw_param_setinteger(struct snd_pcm_hw_params *params,
{ {
int changed; int changed;
changed = snd_interval_setinteger(hw_param_interval(params, var)); changed = snd_interval_setinteger(hw_param_interval(params, var));
if (changed) { if (changed > 0) {
params->cmask |= 1 << var; params->cmask |= 1 << var;
params->rmask |= 1 << var; params->rmask |= 1 << var;
} }

4
sound/core/pcm_lib.c
View File

@ -1603,7 +1603,7 @@ static int _snd_pcm_hw_param_first(struct snd_pcm_hw_params *params,
changed = snd_interval_refine_first(hw_param_interval(params, var)); changed = snd_interval_refine_first(hw_param_interval(params, var));
else else
return -EINVAL; return -EINVAL;
if (changed) { if (changed > 0) {
params->cmask |= 1 << var; params->cmask |= 1 << var;
params->rmask |= 1 << var; params->rmask |= 1 << var;
} }
@ -1649,7 +1649,7 @@ static int _snd_pcm_hw_param_last(struct snd_pcm_hw_params *params,
changed = snd_interval_refine_last(hw_param_interval(params, var)); changed = snd_interval_refine_last(hw_param_interval(params, var));
else else
return -EINVAL; return -EINVAL;
if (changed) { if (changed > 0) {
params->cmask |= 1 << var; params->cmask |= 1 << var;
params->rmask |= 1 << var; params->rmask |= 1 << var;
} }