summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2021-05-18 10:45:51 +0200
committerTakashi Iwai <tiwai@suse.de>2021-05-18 12:22:52 +0200
commit2239924be45cccf3106ee6bee2fb5829a1348113 (patch)
treecd898f1fbe278e473530410061f19eca36e478a9
parentALSA: oxfw: code refactoring to detect mackie models (diff)
downloadlinux-2239924be45cccf3106ee6bee2fb5829a1348113.tar.xz
linux-2239924be45cccf3106ee6bee2fb5829a1348113.zip
ALSA: oxfw: add explicit device entry for Loud Technologies Tapco Link.FireWire 4x6
Loud Technologies Tapco Link.FireWire 4x6 is identified as the model with OXFW970 ASIC. This commit adds explicit entry for the model. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Link: https://lore.kernel.org/r/20210518084557.102681-6-o-takashi@sakamocchi.jp Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/firewire/oxfw/oxfw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index 2af72951ebf8..998f0da6fd5b 100644
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
@@ -47,7 +47,6 @@ static bool detect_loud_models(struct fw_unit *unit)
"Onyx 1640i",
"d.Pro",
"Mackie Onyx Satellite",
- "Tapco LINK.firewire 4x6",
"U.420"};
char model[32];
int err;
@@ -338,12 +337,13 @@ static const struct ieee1394_device_id oxfw_id_table[] = {
OXFW_DEV_ENTRY(VENDOR_LACIE, 0x00f970, &lacie_speakers),
// Behringer,F-Control Audio 202.
OXFW_DEV_ENTRY(VENDOR_BEHRINGER, 0x00fc22, NULL),
+ // Loud Technologies, Tapco Link.FireWire 4x6.
+ OXFW_DEV_ENTRY(VENDOR_LOUD, 0x000460, NULL),
/*
* Any Mackie(Loud) models (name string/model id):
* Onyx-i series (former models): 0x081216
* Onyx 1640i: 0x001640
* Mackie Onyx Satellite: 0x00200f
- * Tapco LINK.firewire 4x6: 0x000460
* d.2 pro/d.4 pro (built-in card): Unknown
* U.420: Unknown
* U.420d: Unknown