Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1d25da5 authored by Kirill Marinushkin's avatar Kirill Marinushkin Committed by Greg Kroah-Hartman
Browse files

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



commit a6618f4aedb2b60932d766bd82ae7ce866e842aa upstream.

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 055c49dc

include/uapi/linux/usb/audio.h

+2 −2
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static inline __u8 uac_processing_unit_bControlSize(struct uac_processing_unit_d 
{

	return (protocol == UAC_VERSION_1) ?

		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,
@@ -377,7 +377,7 @@ static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_de 
{

	return (protocol == UAC_VERSION_1) ?

		&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,