diff options
| author | Daniel Mack | 2010-05-08 11:24:56 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2010-05-08 11:39:44 +0200 |
| commit | 5e688883563ef62bd3725922f1a795a8253df499 (patch) | |
| tree | d19cdd32ceea7634bb4031bb6aaf2c79c3a92b5e | |
| parent | Merge branch 'fix/misc' into topic/usb (diff) | |
| download | kernel-qcow2-linux-5e688883563ef62bd3725922f1a795a8253df499.tar.gz kernel-qcow2-linux-5e688883563ef62bd3725922f1a795a8253df499.tar.xz kernel-qcow2-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>
| -rw-r--r-- | include/linux/usb/audio.h | 2 | ||||
| -rw-r--r-- | sound/usb/mixer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h index 905a87caf3fb..57f20551939d 100644 --- 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 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: { |