aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorDmitry M. Fedin <dmitry.fedin@gmail.com>2015-04-09 17:37:03 +0300
committerBen Hutchings <ben@decadent.org.uk>2015-05-09 23:16:35 +0100
commitd6d3289fe26e3e622e27c0cfb2b4634d9f0bfbfb (patch)
tree886a066440dbb36f73c9bc18c53a51abc25199dd /sound
parentdc6f158c9cea7ff050d79f8f6870eb0362fa4f0c (diff)
downloadkernel_samsung_smdk4412-d6d3289fe26e3e622e27c0cfb2b4634d9f0bfbfb.zip
kernel_samsung_smdk4412-d6d3289fe26e3e622e27c0cfb2b4634d9f0bfbfb.tar.gz
kernel_samsung_smdk4412-d6d3289fe26e3e622e27c0cfb2b4634d9f0bfbfb.tar.bz2
ALSA: usb - Creative USB X-Fi Pro SB1095 volume knob support
commit 3dc8523fa7412e731441c01fb33f003eb3cfece1 upstream. Adds an entry for Creative USB X-Fi to the rc_config array in mixer_quirks.c to allow use of volume knob on the device. Adds support for newer X-Fi Pro card, known as "Model No. SB1095" with USB ID "041e:3237" Signed-off-by: Dmitry M. Fedin <dmitry.fedin@gmail.com> 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_quirks.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index fb95069..040d101 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -64,6 +64,7 @@ static const struct rc_config {
{ USB_ID(0x041e, 0x3040), 2, 2, 6, 6, 2, 0x6e91 }, /* Live! 24-bit */
{ USB_ID(0x041e, 0x3042), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 */
{ USB_ID(0x041e, 0x30df), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 Pro */
+ { USB_ID(0x041e, 0x3237), 0, 1, 1, 1, 1, 0x000d }, /* Usb X-Fi S51 Pro */
{ USB_ID(0x041e, 0x3048), 2, 2, 6, 6, 2, 0x6e91 }, /* Toshiba SB0500 */
};