]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ALSA: usb-audio: Fix forgotten conversion of control query functions
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Apr 2018 06:59:36 +0000 (08:59 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Apr 2018 14:20:29 +0000 (16:20 +0200)
The recent code refactoring made the argument for some helper
functions to be the explicit UAC_CS_* and UAC2_CS_* value instead of
0-based offset.  However, there was one place left forgotten, and it
caused a regression on some devices appearing as the inconsistent
mixer setup.

This patch corrects the forgotten conversion.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199449
Fixes: 7916bc789bd7 ("ALSA: usb-audio: fix uac control query argument")
Tested-by: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/mixer.c

index 301ad61ed4267f28476af340325ae5173a12d2ad..3387483310b15bff0100618bb8ee5f1a0b86f32b 100644 (file)
@@ -1776,7 +1776,8 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid,
                                build_feature_ctl(state, _ftr, ch_bits, control,
                                                  &iterm, unitid, ch_read_only);
                        if (uac_v2v3_control_is_readable(master_bits, control))
-                               build_feature_ctl(state, _ftr, 0, i, &iterm, unitid,
+                               build_feature_ctl(state, _ftr, 0, control,
+                                                 &iterm, unitid,
                                                  !uac_v2v3_control_is_writeable(master_bits,
                                                                                 control));
                }