summaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorDenis Washington <denisw@online.de>2012-12-11 11:38:32 +0100
committerTakashi Iwai <tiwai@suse.de>2012-12-12 11:32:54 +0100
commit1d31affbef40cea4958da03cf6ec3cea1c7f801e (patch)
treed763871408890a21703f3b8e72a9f5efa1c3c910 /sound/usb
parentcc5ede3efdf1c3777efdf92124e7572c1024a7f0 (diff)
downloadlinux-stable-1d31affbef40cea4958da03cf6ec3cea1c7f801e.tar.gz
linux-stable-1d31affbef40cea4958da03cf6ec3cea1c7f801e.tar.bz2
linux-stable-1d31affbef40cea4958da03cf6ec3cea1c7f801e.zip
ALSA: usb-audio: Enable S/PDIF on the ASUS Xonar U3
The only required change is to extend the existing Xonar U1 mixer quirks to the U3, which seems to be controlled the same way. Signed-off-by: Denis Washington <denisw@online.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/mixer_quirks.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index bf28a1b723dc..0422b1360af3 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -430,6 +430,8 @@ static void snd_audigy2nx_proc_read(struct snd_info_entry *entry,
}
}
+/* ASUS Xonar U1 / U3 controls */
+
static int snd_xonar_u1_switch_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
@@ -1305,8 +1307,9 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
err = snd_ftu_create_mixer(mixer);
break;
- case USB_ID(0x0b05, 0x1739):
- case USB_ID(0x0b05, 0x1743):
+ case USB_ID(0x0b05, 0x1739): /* ASUS Xonar U1 */
+ case USB_ID(0x0b05, 0x1743): /* ASUS Xonar U1 (2) */
+ case USB_ID(0x0b05, 0x17a0): /* ASUS Xonar U3 */
err = snd_xonar_u1_controls_create(mixer);
break;