From fc484571db75c6d25121a801a78ad61b1734dbbc Mon Sep 17 00:00:00 2001 From: Pawel Moll Date: Thu, 21 Feb 2013 01:55:50 +0000 Subject: [PATCH] --- yaml --- r: 353505 b: refs/heads/master c: b531f81b0d70ffbe8d70500512483227cc532608 h: refs/heads/master i: 353503: 33ec53c3b70fe066909c1a7e4e0b60f1951cfe1a v: v3 --- [refs] | 2 +- trunk/include/uapi/linux/usb/audio.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index db3cc5bb2d72..94dfa5c524e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92c69e796b83f922c81a5cf7968cb114a7fa14c6 +refs/heads/master: b531f81b0d70ffbe8d70500512483227cc532608 diff --git a/trunk/include/uapi/linux/usb/audio.h b/trunk/include/uapi/linux/usb/audio.h index ac90037894d9..d2314be4f0c0 100644 --- a/trunk/include/uapi/linux/usb/audio.h +++ b/trunk/include/uapi/linux/usb/audio.h @@ -384,14 +384,16 @@ static inline __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_de int protocol) { __u8 control_size = uac_processing_unit_bControlSize(desc, protocol); - return desc->baSourceID[desc->bNrInPins + control_size]; + return *(uac_processing_unit_bmControls(desc, protocol) + + control_size); } static inline __u8 *uac_processing_unit_specific(struct uac_processing_unit_descriptor *desc, int protocol) { __u8 control_size = uac_processing_unit_bControlSize(desc, protocol); - return &desc->baSourceID[desc->bNrInPins + control_size + 1]; + return uac_processing_unit_bmControls(desc, protocol) + + control_size + 1; } /* 4.5.2 Class-Specific AS Interface Descriptor */