diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-29 17:03:48 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-29 17:03:48 +0300 |
| commit | 2d074918fb1568f398777343ff9a28049fb86337 (patch) | |
| tree | 84277c1471f6d575a9515d42a53345666addabc8 /include/uapi/linux/usb/audio.h | |
| parent | 78282bec4b4a02a13b87d01fbe529396d37db926 (diff) | |
| parent | f67b15037a7a50c57f72e69a6d59941ad90a0f0f (diff) | |
| download | linux-2d074918fb1568f398777343ff9a28049fb86337.tar.xz | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
kernel/events/hw_breakpoint.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/usb/audio.h')
| -rw-r--r-- | include/uapi/linux/usb/audio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/usb/audio.h b/include/uapi/linux/usb/audio.h index 17a022c5b414..da3315ed1bcd 100644 --- a/include/uapi/linux/usb/audio.h +++ b/include/uapi/linux/usb/audio.h @@ -370,7 +370,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, @@ -378,7 +378,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, |