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 */