summaryrefslogtreecommitdiffstats
path: root/sound/usb/mixer_maps.c
diff options
context:
space:
mode:
authorMark Hills <mark@pogo.org.uk>2012-04-14 18:19:24 +0200
committerTakashi Iwai <tiwai@suse.de>2012-04-15 15:40:08 +0200
commit7536c301f8817214629e80fa06b5b5c93df3ad52 (patch)
tree6970ff8802640e41ed82b5fc8729b605c405415d /sound/usb/mixer_maps.c
parentALSA: snd-usb-audio: Skip un-parseable mixer units instead of erroring (diff)
downloadlinux-7536c301f8817214629e80fa06b5b5c93df3ad52.tar.xz
linux-7536c301f8817214629e80fa06b5b5c93df3ad52.zip
ALSA: snd-usb-audio: Replace mixer for Electrix Ebox-44
The mixer units from the firmware are corrupt, and even where they are valid they presents mono controls as L and R channels of stereo. Signed-off-by: Mark Hills <mark@pogo.org.uk> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/mixer_maps.c')
-rw-r--r--sound/usb/mixer_maps.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c
index f1324c423835..41daaa24c25f 100644
--- a/sound/usb/mixer_maps.c
+++ b/sound/usb/mixer_maps.c
@@ -288,6 +288,15 @@ static struct usbmix_name_map scratch_live_map[] = {
{ 0 } /* terminator */
};
+static struct usbmix_name_map ebox44_map[] = {
+ { 4, NULL }, /* FU */
+ { 6, NULL }, /* MU */
+ { 7, NULL }, /* FU */
+ { 10, NULL }, /* FU */
+ { 11, NULL }, /* MU */
+ { 0 }
+};
+
/* "Gamesurround Muse Pocket LT" looks same like "Sound Blaster MP3+"
* most importand difference is SU[8], it should be set to "Capture Source"
* to make alsamixer and PA working properly.
@@ -371,6 +380,10 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = {
.map = scratch_live_map,
.ignore_ctl_error = 1,
},
+ {
+ .id = USB_ID(0x200c, 0x1018),
+ .map = ebox44_map,
+ },
{ 0 } /* terminator */
};