Commit a6618f4a authored by Kirill Marinushkin's avatar Kirill Marinushkin Committed by Takashi Iwai

ALSA: usb-audio: Fix parsing descriptor of UAC2 processing unit

Currently, the offsets in the UAC2 processing unit descriptor are
calculated incorrectly. It causes an issue when connecting the device which
provides such a feature:

~~~~
[84126.724420] usb 1-1.3.1: invalid Processing Unit descriptor (id 18)
~~~~

After this patch is applied, the UAC2 processing unit inits w/o this error.

Fixes: 23caaf19 ("ALSA: usb-mixer: Add support for Audio Class v2.0")
Signed-off-by: default avatarKirill Marinushkin <k.marinushkin@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e40bdb03
...@@ -370,7 +370,7 @@ static inline __u8 uac_processing_unit_bControlSize(struct uac_processing_unit_d ...@@ -370,7 +370,7 @@ static inline __u8 uac_processing_unit_bControlSize(struct uac_processing_unit_d
{ {
return (protocol == UAC_VERSION_1) ? return (protocol == UAC_VERSION_1) ?
desc->baSourceID[desc->bNrInPins + 4] : desc->baSourceID[desc->bNrInPins + 4] :
desc->baSourceID[desc->bNrInPins + 6]; 2; /* in UAC2, this value is constant */
} }
static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_descriptor *desc, static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_descriptor *desc,
...@@ -378,7 +378,7 @@ static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_de ...@@ -378,7 +378,7 @@ static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_de
{ {
return (protocol == UAC_VERSION_1) ? return (protocol == UAC_VERSION_1) ?
&desc->baSourceID[desc->bNrInPins + 5] : &desc->baSourceID[desc->bNrInPins + 5] :
&desc->baSourceID[desc->bNrInPins + 7]; &desc->baSourceID[desc->bNrInPins + 6];
} }
static inline __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_descriptor *desc, static inline __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_descriptor *desc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment