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>

diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h
index 905a87caf3fb248d12f7482e77cae21c54c4fdee..57f20551939d1759790cc49b4426c4035dcd5dbb 100644 (file)
--- a/include/linux/usb/audio.h
+++ b/include/linux/usb/audio.h
@@ -244,7 +244,7 @@ struct uac_selector_unit_descriptor {
 static inline __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc)
 {
        __u8 *raw = (__u8 *) desc;
-       return raw[desc->bLength - 1];
+       return raw[9 + desc->bLength - 1];
 }
 
 /* 4.3.2.5 Feature Unit Descriptor */

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 1deef623c0810e36af237893e264d8813046848a..e350f053440a481c7d8f5a79914b6b46ac00afee 100644 (file)
--- 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: {