ALSA: oxfw: code refactoring to detect mackie models

This commit changes condition statement to call mackie models detection
just for the device entry. Additionally, comment is added for Onyx 1640i.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210518084557.102681-5-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index 7be999c6173054f443c60b477d7e2e541999b793..2af72951ebf80fab554b54e5ddc7820195f1c910 100644 (file)
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
@@ -245,7 +245,7 @@ static int oxfw_probe(struct fw_unit *unit,
 {
        struct snd_oxfw *oxfw;
 
-       if (entry->vendor_id == VENDOR_LOUD && !detect_loud_models(unit))
+       if (entry->vendor_id == VENDOR_LOUD && entry->model_id == 0 && !detect_loud_models(unit))
                return -ENODEV;
 
        /* Allocate this independent of sound card instance. */
@@ -341,6 +341,7 @@ static const struct ieee1394_device_id oxfw_id_table[] = {
        /*
         * 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
@@ -352,6 +353,7 @@ static const struct ieee1394_device_id oxfw_id_table[] = {
                                  IEEE1394_MATCH_SPECIFIER_ID |
                                  IEEE1394_MATCH_VERSION,
                .vendor_id      = VENDOR_LOUD,
+               .model_id       = 0,
                .specifier_id   = SPECIFIER_1394TA,
                .version        = VERSION_AVC,
        },