aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2015-06-03 11:36:42 +0200
committerBen Hutchings <ben@decadent.org.uk>2015-08-07 00:32:14 +0100
commita2066716effdbaa16500427710c59db7e540fd5a (patch)
treec0a4c2c781e30b9977876bbd7109adce637b28ea /sound
parent47188f4e51c0dc5b84457e247800bdf1d31c63d4 (diff)
downloadkernel_samsung_smdk4412-a2066716effdbaa16500427710c59db7e540fd5a.zip
kernel_samsung_smdk4412-a2066716effdbaa16500427710c59db7e540fd5a.tar.gz
kernel_samsung_smdk4412-a2066716effdbaa16500427710c59db7e540fd5a.tar.bz2
ALSA: usb-audio: add MAYA44 USB+ mixer control names
commit 044bddb9ca8d49edb91bc22b9940a463b0dbb97f upstream. Add mixer control names for the ESI Maya44 USB+ (which appears to be identical width the AudioTrak Maya44 USB). Reported-by: nightmixes <nightmixes@gmail.com> Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/mixer_maps.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c
index 1e0798f..851786f 100644
--- a/sound/usb/mixer_maps.c
+++ b/sound/usb/mixer_maps.c
@@ -380,6 +380,11 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = {
.ignore_ctl_error = 1,
},
{
+ /* MAYA44 USB+ */
+ .id = USB_ID(0x2573, 0x0008),
+ .map = maya44_map,
+ },
+ {
/* KEF X300A */
.id = USB_ID(0x27ac, 0x1000),
.map = scms_usb3318_map,