Merge branch 'for-next' into for-linus

Preparation for 4.17 merge. Signed-off-by: Takashi Iwai <tiwai@suse.de>
mariux64 · Apr 2, 2018 · bc334cb · bc334cb
2 parents 5607ddd + b44d419
commit bc334cb
Show file tree

Hide file tree

Showing 35 changed files with 1,853 additions and 473 deletions.
diff --git a/include/linux/usb/audio-v2.h b/include/linux/usb/audio-v2.h
@@ -34,14 +34,14 @@
  *
  */
 
-static inline bool uac2_control_is_readable(u32 bmControls, u8 control)
+static inline bool uac_v2v3_control_is_readable(u32 bmControls, u8 control)
 {
-	return (bmControls >> (control * 2)) & 0x1;
+	return (bmControls >> ((control - 1) * 2)) & 0x1;
 }
 
-static inline bool uac2_control_is_writeable(u32 bmControls, u8 control)
+static inline bool uac_v2v3_control_is_writeable(u32 bmControls, u8 control)
 {
-	return (bmControls >> (control * 2)) & 0x2;
+	return (bmControls >> ((control - 1) * 2)) & 0x2;
 }
 
 /* 4.7.2 Class-Specific AC Interface Descriptor */