summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-04-23 08:59:36 +0200
committerTakashi Iwai <tiwai@suse.de>2018-04-23 16:20:29 +0200
commit2de841efaeafa9f597e495ffdf5a024079c4bfe7 (patch)
tree7e596fb903c04702e97196809b012430d5a3c799 /sound
parent1ba7862f1f5a7a3b268cf79ac236611546888a90 (diff)
downloadlinux-stable-2de841efaeafa9f597e495ffdf5a024079c4bfe7.tar.gz
linux-stable-2de841efaeafa9f597e495ffdf5a024079c4bfe7.tar.bz2
linux-stable-2de841efaeafa9f597e495ffdf5a024079c4bfe7.zip
ALSA: usb-audio: Fix forgotten conversion of control query functions
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: 21e9b3e931f7 ("ALSA: usb-audio: fix uac control query argument") Tested-by: Nazar Mokrynskyi <nazar@mokrynskyi.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/mixer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 301ad61ed426..3387483310b1 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -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));
}