Takashi Iwai
1848bd6c60
- Upstream fixes, including the alsa-tools build breakage: 0001-ucm-Use-strncmp-to-avoid-access-out-of-boundary.patch 0002-ucm-return-always-at-least-NULL-if-no-list-is-availa.patch 0003-ucm-add-_identifiers-list.patch 0004-namehint-correct-the-args-check.patch 0005-namehint-improve-the-previous-patch-check-the-return.patch 0006-ucm-docs-allow-spaces-in-device-names-for-JackHWMute.patch 0007-use-case-docs-add-PlaybackMixerCopy-and-CaptureMixer.patch 0008-ucm-docs-add-JackCTL-rearrange-JackControl-and-JackD.patch 0009-ucm-Do-not-fail-to-parse-configs-on-cards-with-an-em.patch 0010-src-ucm-main.c-fix-build-without-mixer.patch 0011-alsa.m4-another-try-to-fix-the-libatopology-detectio.patch 0012-ucm-docs-add-Mic-DigitalMic-and-multiple-devices-com.patch 0013-ucm-docs-remove-DigitalMic-it-does-not-have-sense.patch 0014-ucm-docs-change-the-Mic-description-to-simple-Microp.patch 0015-ucm-docs-add-note-about-the-sequences-and-device-spl.patch 0016-ucm-docs-remove-MixerCopy-values-add-Priority-for-ve.patch 0017-ucm-setup-conf_format-after-getting-ALSA_CONFIG_UCM_.patch 0018-alsa-lib-fix-the-array-parser-unique-compound-keys.patch 0019-topology-remove-vendor_fd-name-from-snd_tplg-structu.patch 0020-topology-file-position-and-size-cleanups.patch 0021-topology-use-an-array-describing-blocks-for-the-main.patch 0022-topology-use-size_t-for-calc_block_size.patch 0023-topology-merge-write_block-to-tplg_write_data.patch 0024-topology-make-vebose-output-more-nice.patch 0025-topology-use-list_insert-macro-in-tplg_elem_insert.patch 0026-topology-dapm-coding-fixes.patch 0027-topology-dapm-merge-identical-index-blocks-like-for-.patch 0028-topology-more-coding-fixes.patch 0029-Fix-alsa-sound-.h-for-external-programs.patch OBS-URL: https://build.opensuse.org/request/show/758564 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=263
32 lines
963 B
Diff
32 lines
963 B
Diff
From 1744159180ac94a72036d7232e674c58cedee70a Mon Sep 17 00:00:00 2001
|
|
From: Libin Yang <libin.yang@linux.intel.com>
|
|
Date: Wed, 11 Dec 2019 14:07:19 +0800
|
|
Subject: [PATCH 17/30] ucm: setup conf_format after getting
|
|
ALSA_CONFIG_UCM_VAR successfully
|
|
|
|
Set the conf_format to 1 after getting ALSA_CONFIG_UCM_VAR successfully.
|
|
Otherwise, the conf_format is not set in this scenario.
|
|
|
|
Signed-off-by: Libin Yang <libin.yang@linux.intel.com>
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/ucm/parser.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/src/ucm/parser.c b/src/ucm/parser.c
|
|
index ba5002779f56..d61124a343e1 100644
|
|
--- a/src/ucm/parser.c
|
|
+++ b/src/ucm/parser.c
|
|
@@ -89,6 +89,8 @@ static void configuration_filename(snd_use_case_mgr_t *uc_mgr,
|
|
env = getenv(ALSA_CONFIG_UCM2_VAR);
|
|
if (env == NULL) {
|
|
env = getenv(ALSA_CONFIG_UCM_VAR);
|
|
+ if (env)
|
|
+ uc_mgr->conf_format = 1;
|
|
} else {
|
|
uc_mgr->conf_format = 2;
|
|
}
|
|
--
|
|
2.16.4
|
|
|