summaryrefslogtreecommitdiffstats
path: root/sound/usb/mixer.c
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2010-05-08 11:24:56 +0200
committerTakashi Iwai <tiwai@suse.de>2010-05-08 11:39:44 +0200
commit5e688883563ef62bd3725922f1a795a8253df499 (patch)
treed19cdd32ceea7634bb4031bb6aaf2c79c3a92b5e /sound/usb/mixer.c
parent27762b2ce16d5c6f7bc8ab1aad1b9179076f997a (diff)
downloadlinux-5e688883563ef62bd3725922f1a795a8253df499.tar.gz
linux-5e688883563ef62bd3725922f1a795a8253df499.tar.bz2
linux-5e688883563ef62bd3725922f1a795a8253df499.zip
ALSA: sound/usb: fix UAC1 regression
Commit 23caaf19b ("ALSA: usb-mixer: Add support for Audio Class v2.0") broke support for Class1 devices due to two faulty changes. This patch fixes it. Signed-off-by: Daniel Mack <daniel@caiaq.de> Reported-and-Tested-by: The Source <thesourcehim@gmail.com> Cc: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/mixer.c')
-rw-r--r--sound/usb/mixer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 1deef623c081..e350f053440a 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -656,7 +656,7 @@ static int check_input_term(struct mixer_build *state, int id, struct usb_audio_
case UAC_FEATURE_UNIT: {
/* the header is the same for v1 and v2 */
struct uac_feature_unit_descriptor *d = p1;
- id = d->bUnitID;
+ id = d->bSourceID;
break; /* continue to parse */
}
case UAC_MIXER_UNIT: {