imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-10-30 05:42:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: usb-audio: Propagate write errors in generic mixer put callbacks

Browse Source 
mixer_ctl_feature_put(), mixer_ctl_procunit_put(), and
mixer_ctl_selector_put() ignore failures from their SET_CUR helper
routines and report the control as changed whenever the requested
value differs from the current one.

If the device rejects the write, userspace still sees success although
the hardware state did not change. Propagate write failures instead,
using filter_error() so ignore_ctl_error keeps the same semantics as
the existing get paths.

Signed-off-by: Cássio Gabriel <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
Link: https://patch.msgid.link/[email protected]
This commit is contained in:
Cássio Gabriel authored and Takashi Iwai committed 2026-04-27 13:44:48 +02:00
1 parent b3163bf3ad
commit 87a6f2fa6e
1 file changed
+13 -4
Download Patch File Download Diff File Expand all files Collapse all files
sound/usb/mixer.c
+13 -4
View File
@@ -1526,7 +1526,10 @@ static int mixer_ctl_feature_put(struct snd_kcontrol *kcontrol,
return -EINVAL;
val = get_abs_value(cval, val);
if (oval != val) {
snd_usb_set_cur_mix_value(cval, c + 1, cnt, val);
err = snd_usb_set_cur_mix_value(cval, c + 1,
cnt, val);
if (err < 0)
return filter_error(cval, err);
changed = 1;
}
cnt++;
@@ -1541,7 +1544,9 @@ static int mixer_ctl_feature_put(struct snd_kcontrol *kcontrol,
return -EINVAL;
val = get_abs_value(cval, val);
if (val != oval) {
snd_usb_set_cur_mix_value(cval, 0, 0, val);
err = snd_usb_set_cur_mix_value(cval, 0, 0, val);
if (err < 0)
return filter_error(cval, err);
changed = 1;
}
}
@@ -2466,7 +2471,9 @@ static int mixer_ctl_procunit_put(struct snd_kcontrol *kcontrol,
return -EINVAL;
val = get_abs_value(cval, val);
if (val != oval) {
set_cur_ctl_value(cval, cval->control << 8, val);
err = set_cur_ctl_value(cval, cval->control << 8, val);
if (err < 0)
return filter_error(cval, err);
return 1;
}
return 0;
@@ -2832,7 +2839,9 @@ static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol,
return -EINVAL;
val = get_abs_value(cval, val);
if (val != oval) {
set_cur_ctl_value(cval, cval->control << 8, val);
err = set_cur_ctl_value(cval, cval->control << 8, val);
if (err < 0)
return filter_error(cval, err);
return 1;
}
return 0;