ucm: fix the configuration directory (longname) for ucm2

The new ucm2 expects that the longname directory is shared with
the driver directory. Fix that for 'Syntax 2'.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/src/ucm/parser.c b/src/ucm/parser.c
index d61124a343e118b216bf09263c1f7c35a163ed7b..b3970a13bf7393b646f042650c4822fa403fbfa8 100644 (file)
--- a/src/ucm/parser.c
+++ b/src/ucm/parser.c
@@ -1649,7 +1649,9 @@ __longname:
 
                if (err == 0) {
                        /* got device-specific file that matches the card long name */
-                       snd_strlcpy(uc_mgr->conf_file_name, longname, sizeof(uc_mgr->conf_file_name));
+                       if (uc_mgr->conf_format < 2)
+                               snd_strlcpy(uc_mgr->conf_file_name, longname,
+                                           sizeof(uc_mgr->conf_file_name));
                        goto __parse;
                }
        }