1 files changed, 16 insertions, 3 deletions

diff --git a/include/uapi/linux/usb/audio.h b/include/uapi/linux/usb/audio.h
index 3a78e7145689..13d98e6e0db1 100644
--- a/include/uapi/linux/usb/audio.h
+++ b/include/uapi/linux/usb/audio.h
@@ -285,9 +285,22 @@ static inline __u8 uac_mixer_unit_iChannelNames(struct uac_mixer_unit_descriptor
 static inline __u8 *uac_mixer_unit_bmControls(struct uac_mixer_unit_descriptor *desc,
                                               int protocol)
 {
-        return (protocol == UAC_VERSION_1) ?
-                &desc->baSourceID[desc->bNrInPins + 4] :
-                &desc->baSourceID[desc->bNrInPins + 6];
+        switch (protocol) {
+        case UAC_VERSION_1:
+                return &desc->baSourceID[desc->bNrInPins + 4];
+        case UAC_VERSION_2:
+                return &desc->baSourceID[desc->bNrInPins + 6];
+        case UAC_VERSION_3:
+                return &desc->baSourceID[desc->bNrInPins + 2];
+        default:
+                return NULL;
+        }
+}
+
+static inline __u16 uac3_mixer_unit_wClusterDescrID(struct uac_mixer_unit_descriptor *desc)
+{
+        return (desc->baSourceID[desc->bNrInPins + 1] << 8) |
+                desc->baSourceID[desc->bNrInPins];
 }
 
 static inline __u8 uac_mixer_unit_iMixer(struct uac_mixer_unit_descriptor *desc)