Skip to content

Commit a07ebc7

Browse files
takaswietiwai
authored andcommitted
ALSA: bebob: correct duplicated entries with TerraTec OUI
ALSA bebob driver has duplicated entries for modalias of 'ieee1394:ven00000AACmo00000002sp0000A02Dver00010001' since entries for two devices below have the same parameters: * Acoustic Reality eAR Master One, Eroica, Figaro, and Ciaccona * TerraTec Aureon 7.1 FireWire I relied on FFADO revision 737 to add the former entry, on the other hand, the latter is based on message posted by actual user with information of sysfs node: * https://sourceforge.net/p/ffado/mailman/ffado-user/thread/5743F969.2080204%40marcobaldo.ch/ It appears that they have OUI of Terratec Electronic GmbH (0x000aac) and the same model ID, thus suffice to say that they have something common in their internals. Although it's not going to make a big difference, this commit arranges the entries. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Link: https://lore.kernel.org/r/20210705111455.63788-1-o-takashi@sakamocchi.jp Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent ea57e87 commit a07ebc7

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

sound/firewire/bebob/bebob.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,6 @@ static const struct ieee1394_device_id bebob_id_table[] = {
403403
SND_BEBOB_DEV_ENTRY(VEN_APOGEE, 0x01eeee, &spec_normal),
404404
/* ESI, Quatafire610 */
405405
SND_BEBOB_DEV_ENTRY(VEN_ESI, 0x00010064, &spec_normal),
406-
// AcousticReality, eARMasterOne. Terratec OEM.
407-
SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000002, &spec_normal),
408406
/* CME, MatrixKFW */
409407
SND_BEBOB_DEV_ENTRY(VEN_CME, 0x00030000, &spec_normal),
410408
// Phonic Helix Board 12 FireWire MkII.
@@ -434,7 +432,8 @@ static const struct ieee1394_device_id bebob_id_table[] = {
434432
SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000007, &yamaha_terratec_spec),
435433
/* TerraTec Electronic GmbH, EWS MIC2/MIC8 */
436434
SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000005, &spec_normal),
437-
/* Terratec Electronic GmbH, Aureon 7.1 Firewire */
435+
// Terratec Electronic GmbH, Aureon 7.1 Firewire.
436+
// AcousticReality, eAR Master One, Eroica, Figaro, and Ciaccona. Perhaps Terratec OEM.
438437
SND_BEBOB_DEV_ENTRY(VEN_TERRATEC, 0x00000002, &spec_normal),
439438
/* Yamaha, GO44 */
440439
SND_BEBOB_DEV_ENTRY(VEN_YAMAHA, 0x0010000b, &yamaha_terratec_spec),

0 commit comments

Comments
 (0)