mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ucm: quick fix for the previous commit when ALSA_CONFIG_UCM_VAR is set

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-11-19 14:15:00 +01:00
parent 10a63e093c
commit 2e53bbd876
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/ucm/parser.c
View file

@ -1584,20 +1584,21 @@ static int load_master_config(snd_use_case_mgr_t *uc_mgr,
uc_mgr->conf_format = 2; uc_mgr->conf_format = 2;
configuration_filename(uc_mgr, filename, sizeof(filename), configuration_filename(uc_mgr, filename, sizeof(filename),
uc_mgr->conf_file_name, card_name, ".conf"); uc_mgr->conf_file_name, card_name, ".conf");
if (access(filename, R_OK) == 0)
goto __load;
} }
if (uc_mgr->conf_format >= 2 && access(filename, R_OK) != 0) { /* try the old ucm directory */
/* try the old ucm directory */ uc_mgr->conf_format = 1;
uc_mgr->conf_format = 1; configuration_filename(uc_mgr, filename, sizeof(filename),
configuration_filename(uc_mgr, filename, sizeof(filename), card_name, card_name, ".conf");
card_name, card_name, ".conf"); if (access(filename, R_OK) != 0)
if (access(filename, R_OK) != 0) return -ENOENT;
return -ENOENT;
}
} else { } else {
configuration_filename(uc_mgr, filename, sizeof(filename), configuration_filename(uc_mgr, filename, sizeof(filename),
card_name, card_name, ".conf"); card_name, card_name, ".conf");
} }
__load:
err = uc_mgr_config_load(uc_mgr->conf_format, filename, cfg); err = uc_mgr_config_load(uc_mgr->conf_format, filename, cfg);
if (err < 0) { if (err < 0) {
uc_error("error: could not parse configuration for card %s", uc_error("error: could not parse configuration for card %s",