AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ALSA: hda - fix the 'Capture Switch' value change notifications

Browse Source 
[ Upstream commit a2befe9380dd04ee76c871568deca00eedf89134 ]

The original code in the cap_put_caller() function does not
handle correctly the positive values returned from the passed
function for multiple iterations. It means that the change
notifications may be lost.

Fixes: 352f7f914e ("ALSA: hda - Merge Realtek parser code to generic parser")
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=213851
Cc: <stable@kernel.org>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20210811161441.1325250-1-perex@perex.cz
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jaroslav Kysela 2021-08-11 18:14:41 +02:00 committed by Sasha Levin
parent 7451c309c7
commit f7c125493c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/pci/hda/hda_generic.c
View File

@ -3458,7 +3458,7 @@ static int cap_put_caller(struct snd_kcontrol *kcontrol,
struct hda_gen_spec *spec = codec->spec; struct hda_gen_spec *spec = codec->spec;
const struct hda_input_mux *imux; const struct hda_input_mux *imux;
struct nid_path *path; struct nid_path *path;
int i, adc_idx, err = 0; int i, adc_idx, ret, err = 0;
imux = &spec->input_mux; imux = &spec->input_mux;
adc_idx = kcontrol->id.index; adc_idx = kcontrol->id.index;
@ -3468,9 +3468,13 @@ static int cap_put_caller(struct snd_kcontrol *kcontrol,
if (!path || !path->ctls[type]) if (!path || !path->ctls[type])
continue; continue;
kcontrol->private_value = path->ctls[type]; kcontrol->private_value = path->ctls[type];
err = func(kcontrol, ucontrol); ret = func(kcontrol, ucontrol);
if (err < 0) if (ret < 0) {
err = ret;
break; break;
}
if (ret > 0)
err = 1;
} }
mutex_unlock(&codec->control_mutex); mutex_unlock(&codec->control_mutex);
if (err >= 0 && spec->cap_sync_hook) if (err >= 0 && spec->cap_sync_hook)