summaryrefslogtreecommitdiffstats
path: root/sound/usb/quirks.c
diff options
context:
space:
mode:
authorEduard Gilmutdinov <edgilmutdinov@gmail.com>2013-12-20 14:06:58 +0600
committerTakashi Iwai <tiwai@suse.de>2014-01-14 13:56:31 +0100
commit11e424e88bd493b5d55d73d96c82bd889002ef30 (patch)
tree222a2bd59eefdbf8fe99bd930746047b08a373ed /sound/usb/quirks.c
parent493a52a9b6645f61954580c7d4bd52fa62110934 (diff)
downloadop-kernel-dev-11e424e88bd493b5d55d73d96c82bd889002ef30.zip
op-kernel-dev-11e424e88bd493b5d55d73d96c82bd889002ef30.tar.gz
ALSA: usb-audio: Add support for Focusrite Saffire 6 USB
Signed-off-by: Eduard Gilmutdinov <edgilmutdinov@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/quirks.c')
-rw-r--r--sound/usb/quirks.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index ede7536..897307076 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -674,8 +674,9 @@ static int snd_usb_gamecon780_boot_quirk(struct usb_device *dev)
/*
* Novation Twitch DJ controller
+ * Focusrite Novation Saffire 6 USB audio card
*/
-static int snd_usb_twitch_boot_quirk(struct usb_device *dev)
+static int snd_usb_novation_boot_quirk(struct usb_device *dev)
{
/* preemptively set up the device because otherwise the
* raw MIDI endpoints are not active */
@@ -984,9 +985,9 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev,
/* Digidesign Mbox 2 */
return snd_usb_mbox2_boot_quirk(dev);
- case USB_ID(0x1235, 0x0018):
- /* Focusrite Novation Twitch */
- return snd_usb_twitch_boot_quirk(dev);
+ case USB_ID(0x1235, 0x0010): /* Focusrite Novation Saffire 6 USB */
+ case USB_ID(0x1235, 0x0018): /* Focusrite Novation Twitch */
+ return snd_usb_novation_boot_quirk(dev);
case USB_ID(0x133e, 0x0815):
/* Access Music VirusTI Desktop */
OpenPOWER on IntegriCloud