Takashi Iwai
0fcb2a0c4b
- Backport upstream fixes: ucm-parser fixes and enhancements, configure script cleanup, fixes of 5.6 kernel ABI, O_CLOEXEC flag fix: 0064-ucm-parser-cosmetic-fixes-in-the-comments.patch 0065-configure.ac-remove-an-unnecessary-libtool-fix.patch 0066-ucm-parser-use-correct-filename-in-parser_master_fil.patch 0067-ucm-the-ucm2-subdirectory-is-driver-name-based.patch 0068-ucm-implement-RenameDevice-and-RemoveDevice-verb-man.patch 0069-ucm-fill-missing-device-entries-conflicting-supporte.patch 0070-control-Remove-access-to-the-deprecated-dimen-fields.patch 0071-topology-Drop-SNDRV_CTL_ELEM_ACCESS_TIMESTAMP-access.patch 0072-uapi-Sync-with-5.6-kernel-ABI.patch 0073-ucm-parser-add-error-message-to-verb_dev_list_add.patch 0074-do-not-set-close-on-exec-flag-on-descriptor-if-it-wa.patch OBS-URL: https://build.opensuse.org/request/show/774837 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=267
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From c5a09b0feaf759957dfac2c797b652781a0d41fe Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Mon, 3 Feb 2020 14:44:13 +0100
|
|
Subject: [PATCH 66/74] ucm: parser - use correct filename in
|
|
parser_master_file()
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/ucm/parser.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/ucm/parser.c b/src/ucm/parser.c
|
|
index 6c5d29026e5e..dbbd381755b1 100644
|
|
--- a/src/ucm/parser.c
|
|
+++ b/src/ucm/parser.c
|
|
@@ -1413,16 +1413,16 @@ static int parse_master_file(snd_use_case_mgr_t *uc_mgr, snd_config_t *cfg)
|
|
if (uc_mgr->conf_format >= 2) {
|
|
err = snd_config_search(cfg, "Syntax", &n);
|
|
if (err < 0) {
|
|
- uc_error("Syntax field not found in %s", uc_mgr->conf_dir_name);
|
|
+ uc_error("Syntax field not found in %s", uc_mgr->conf_file_name);
|
|
return -EINVAL;
|
|
}
|
|
err = snd_config_get_integer(n, &l);
|
|
if (err < 0) {
|
|
- uc_error("Syntax field is invalid in %s", uc_mgr->conf_dir_name);
|
|
+ uc_error("Syntax field is invalid in %s", uc_mgr->conf_file_name);
|
|
return err;
|
|
}
|
|
if (l < 2 || l > SYNTAX_VERSION_MAX) {
|
|
- uc_error("Incompatible syntax %d in %s", l, uc_mgr->conf_dir_name);
|
|
+ uc_error("Incompatible syntax %d in %s", l, uc_mgr->conf_file_name);
|
|
return -EINVAL;
|
|
}
|
|
/* delete this field to avoid strcmp() call in the loop */
|
|
--
|
|
2.16.4
|
|
|