aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/mixer.h
diff options
context:
space:
mode:
authorJulian Scheel <julian@jusst.de>2015-08-14 16:14:45 +0200
committerTakashi Iwai <tiwai@suse.de>2015-08-14 16:26:50 +0200
commitbc18e31c3042f14fa5f2ff5c21136e2fdf4140f8 (patch)
tree31513402256a76135200a39b0db449d93df3dc42 /sound/usb/mixer.h
parentMerge branch 'for-linus' into for-next (diff)
downloadlinux-dev-bc18e31c3042f14fa5f2ff5c21136e2fdf4140f8.tar.xz
linux-dev-bc18e31c3042f14fa5f2ff5c21136e2fdf4140f8.zip
ALSA: usb-audio: Fix parameter block size for UAC2 control requests
USB Audio Class version 2.0 supports three different parameter block sizes for CUR requests, which are 1 byte (5.2.3.1 Layout 1 Parameter Block), 2 bytes (5.2.3.2 Layout 2 Parameter Block) and 4 bytes (5.2.3.3 Layout 3 Parameter Block). Use the correct size according to the specific control as it was already done for UACv1. The allocated block size for control requests is increased to support the 4 byte worst case. Signed-off-by: Julian Scheel <julian@jusst.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/mixer.h')
-rw-r--r--sound/usb/mixer.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
index d3268f0ee2b3..3417ef347e40 100644
--- a/sound/usb/mixer.h
+++ b/sound/usb/mixer.h
@@ -33,6 +33,8 @@ enum {
USB_MIXER_U8,
USB_MIXER_S16,
USB_MIXER_U16,
+ USB_MIXER_S32,
+ USB_MIXER_U32,
};
typedef void (*usb_mixer_elem_dump_func_t)(struct snd_info_buffer *buffer,