aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/mixer_maps.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2014-02-16 17:11:10 +0100
committerBen Hutchings <ben@decadent.org.uk>2014-04-02 00:58:53 +0100
commit41c625d7d7b8d7e2626011794c3f0a6fcca0c342 (patch)
tree52c3fa4119cad7a44b31f4bf1b4c4de82d69750d /sound/usb/mixer_maps.c
parent74f925dea76124060a2021460a26c6ddc815bfff (diff)
downloadkernel_samsung_smdk4412-41c625d7d7b8d7e2626011794c3f0a6fcca0c342.zip
kernel_samsung_smdk4412-41c625d7d7b8d7e2626011794c3f0a6fcca0c342.tar.gz
kernel_samsung_smdk4412-41c625d7d7b8d7e2626011794c3f0a6fcca0c342.tar.bz2
ALSA: usb-audio: work around KEF X300A firmware bug
commit 624aef494f86ed0c58056361c06347ad62b26806 upstream. When the driver tries to access Function Unit 10, the KEF X300A speakers' firmware apparently locks up, making even PCM streaming impossible. Work around this by ignoring this FU. 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/usb/mixer_maps.c')
-rw-r--r--sound/usb/mixer_maps.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c
index f1324c4..0e4e909 100644
--- a/sound/usb/mixer_maps.c
+++ b/sound/usb/mixer_maps.c
@@ -304,6 +304,11 @@ static struct usbmix_name_map hercules_usb51_map[] = {
{ 0 } /* terminator */
};
+static const struct usbmix_name_map kef_x300a_map[] = {
+ { 10, NULL }, /* firmware locks up (?) when we try to access this FU */
+ { 0 }
+};
+
/*
* Control map entries
*/
@@ -371,6 +376,10 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = {
.map = scratch_live_map,
.ignore_ctl_error = 1,
},
+ {
+ .id = USB_ID(0x27ac, 0x1000),
+ .map = kef_x300a_map,
+ },
{ 0 } /* terminator */
};