summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Rastén <johan@oljud.se>2015-06-11 10:04:51 +0200
committerTakashi Iwai <tiwai@suse.de>2015-06-11 11:57:35 +0200
commit27c41dad3a012c5acead1d903d1743297457b69c (patch)
treec8b69e33f8782d9db94e071d032605c4e09d3618
parent4af88a9c1ba2d39263eef003ea598c657014e59e (diff)
downloadblackbird-obmc-linux-27c41dad3a012c5acead1d903d1743297457b69c.tar.gz
blackbird-obmc-linux-27c41dad3a012c5acead1d903d1743297457b69c.zip
ALSA: usb-audio: Set correct type for some UAC2 mixer controls.
Changed ctl type for Input Gain Control and Input Gain Pad Control to USB_MIXER_S16 as per section 5.2.5.7.11-12 in the USB Audio Class 2.0 definition. Signed-off-by: Johan Rastén <johan@oljud.se> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/usb/mixer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 8b7e391dd0b8..6b3acba5da7a 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -809,12 +809,12 @@ static struct usb_feature_control_info audio_feature_info[] = {
{ "Tone Control - Treble", USB_MIXER_S8 },
{ "Graphic Equalizer", USB_MIXER_S8 }, /* FIXME: not implemeted yet */
{ "Auto Gain Control", USB_MIXER_BOOLEAN },
- { "Delay Control", USB_MIXER_U16 },
+ { "Delay Control", USB_MIXER_U16 }, /* FIXME: U32 in UAC2 */
{ "Bass Boost", USB_MIXER_BOOLEAN },
{ "Loudness", USB_MIXER_BOOLEAN },
/* UAC2 specific */
- { "Input Gain Control", USB_MIXER_U16 },
- { "Input Gain Pad Control", USB_MIXER_BOOLEAN },
+ { "Input Gain Control", USB_MIXER_S16 },
+ { "Input Gain Pad Control", USB_MIXER_S16 },
{ "Phase Inverter Control", USB_MIXER_BOOLEAN },
};
OpenPOWER on IntegriCloud