Takashi Iwai
4594d6ec9e
- Backport recent upstream fixes: topology API fix, UCM fixes/improvements, config fixes, chmap support in route plugin, timestamp type fix for dmix: 0006-topology-add-back-asrc-to-widget_map-in-dapm.c.patch 0007-ucm-clarify-the-index-syntax-for-the-device-names.patch 0008-ucm-fix-uc_mgr_scan_master_configs.patch 0009-namehint-remember-the-direction-from-the-upper-level.patch 0010-conf-fix-namehint-for-pcm.front-and-pcm.iec958.patch 0011-pcm-add-chmap-option-to-route-plugin.patch 0012-usecase-allow-indexes-also-for-modifier-names.patch 0013-ucm-fix-the-device-remove-operation.patch 0014-ucm-fix-copy-n-paste-typo-RemoveDevice-list.patch 0015-pcm-dmix-fix-sw_params-handling-of-timestamp-types-i.patch 0016-conf-USB-Audio-Fix-S-PDIF-output-of-ASUS-Xonar-AE.patch OBS-URL: https://build.opensuse.org/request/show/796086 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=271
32 lines
888 B
Diff
32 lines
888 B
Diff
From 6137d263f3805c72781ea74b813b0e3754f5fc34 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Tue, 17 Mar 2020 16:20:52 +0100
|
|
Subject: [PATCH 08/16] ucm: fix uc_mgr_scan_master_configs()
|
|
|
|
Skip the lookup, if the top level filename does not exist.
|
|
|
|
Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/16
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/ucm/parser.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/src/ucm/parser.c b/src/ucm/parser.c
|
|
index 8d6eea31f8e7..0001e5953707 100644
|
|
--- a/src/ucm/parser.c
|
|
+++ b/src/ucm/parser.c
|
|
@@ -1969,6 +1969,9 @@ int uc_mgr_scan_master_configs(const char **_list[])
|
|
|
|
configuration_filename2(filename, sizeof(filename), 2,
|
|
d_name, d_name, ".conf");
|
|
+ if (eaccess(filename, R_OK))
|
|
+ continue;
|
|
+
|
|
err = uc_mgr_config_load(2, filename, &cfg);
|
|
if (err < 0)
|
|
goto __err;
|
|
--
|
|
2.16.4
|
|
|