mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-16 20:17:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: usb-audio: Set the value of potential sticky mixers to maximum

Browse Source 
It makes no sense to restore the saved value for a sticky mixer, since
setting any value is a no-op.

However, in some rare cases, SET_CUR is effective despite GET_CUR always
returns a constant value. These mixers are not sticky, but there's no
way to distinguish them. Without any additional information, the best
thing we can do is to set the mixer value to the maximum before bailing
out, so that a soft mixer can still reach the maximum hardware volume if
the mixer turns out to be non-sticky. Meanwhile, all channels must be
synchronized to prevent imbalance volume.

Fixes: 86aa1ea1f1 ("ALSA: usb-audio: Do not expose sticky mixers")
Signed-off-by: Rong Zhang <i@rong.moe>
Link: https://patch.msgid.link/20260531-uac-sticky-error-path-v1-1-12c2329d17ef@rong.moe
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Rong Zhang
2026-05-31 03:52:49 +08:00
committed by Takashi Iwai
parent 2c142b63c8
commit aa2f4addab
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sound/usb/mixer.c
View File

@@ -1371,10 +1371,8 @@ static int get_min_max_with_quirks(struct usb_mixer_elem_info *cval,
goto no_checks;
ret = check_sticky_volume_control(cval, minchn, saved);
if (ret < 0) {
snd_usb_set_cur_mix_value(cval, minchn, 0, saved);
return ret;
}
if (ret < 0)
goto sticky;
if (cval->min + cval->res < cval->max)
check_volume_control_res(cval, minchn, saved);
@@ -1431,6 +1429,33 @@ static int get_min_max_with_quirks(struct usb_mixer_elem_info *cval,
}
return 0;
sticky:
/*
* It makes no sense to restore the saved value for a sticky mixer,
* since setting any value is a no-op.
*
* However, in some rare cases, SET_CUR is effective despite GET_CUR
* always returns a constant value. These mixers are not sticky, but
* there's no way to distinguish them. Without any additional
* information, the best thing we can do is to set the mixer value to
* the maximum before bailing out, so that a soft mixer can still reach
* the maximum hardware volume if the mixer turns out to be non-sticky.
* Meanwhile, all channels must be synchronized to prevent imbalance
* volume.
*/
if (!cval->cmask) {
snd_usb_set_cur_mix_value(cval, 0, 0, cval->max);
} else {
for (i = 0; i < MAX_CHANNELS; i++) {
idx = 0;
if (cval->cmask & BIT(i)) {
snd_usb_set_cur_mix_value(cval, i + 1, idx, cval->max);
idx++;
}
}
}
return ret;
}
#define get_min_max(cval, def) get_min_max_with_quirks(cval, def, NULL)