Takashi Iwai
4f7fd72c0e
- Backport upstream fixes: 0001-ucm-substitution-remove-duplicate-allow_empty-assign.patch 0002-ucm-fix-parse_get_safe_name-safe-name-must-be-checke.patch 0003-ucm-substitute-the-merged-tree-completely.patch 0004-ctl-improve-documentation-for-identifier-of-control-.patch 0005-pcm-dmix-make-lockless-operation-optional.patch 0006-pcm-dmix-Fix-semaphore-usage-with-lockless-operation.patch 0007-pcm-iec958-implement-HDMI-HBR-audio-formatting.patch 0008-pcm-iec958-set-channel-status-bits-according-to-rate.patch 0009-conf-pcm-USB-Added-S-PDIF-fix-for-Asus-Xonar-SE.patch 0010-control-ctlparse-fix-enum-values-in-or.patch 0011-conf-USB-Audio-Disable-IEC958-on-Lenovo-ThinkStation.patch 0012-pcm-dmix-fix-access-to-sum-buffer-in-non-interleaved.patch 0014-control-Add-documentation-for-snd_ctl_elem_list_.patch 0015-conf-quote-also-strings-with-and-characters-in-strin.patch 0016-topology-decode-Fix-channel-map-memory-allocation.patch 0017-topology-decode-Fix-infinite-loop-in-decoding-enum-c.patch 0018-topology-decode-Remove-decoding-values-for-enum-cont.patch 0019-topology-decode-Add-enum-control-texts-as-separate-e.patch 0020-topology-decode-Fix-printing-texts-section.patch 0021-topology-decode-Change-declaration-of-enum-decoding-.patch 0022-topology-decode-Fix-decoding-PCM-formats-and-rates.patch 0023-topology-decode-Print-sig_bits-field-in-PCM-capabili.patch 0024-topology-decode-Add-DAI-name-printing.patch 0025-topology-Make-buffer-for-saving-dynamic-size.patch 0026-topology-return-correct-value-in-tplg_save_printf.patch 0027-topology-fix-some-gcc10-warnings-labs-signess.patch 0028-topology-fix-sort_config.patch 0029-topology-fix-the-unaligned-access.patch 0030-topology-improve-the-printf-buffer-management.patch OBS-URL: https://build.opensuse.org/request/show/836375 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=281
37 lines
1.0 KiB
Diff
37 lines
1.0 KiB
Diff
From 485930ea5dc8a14e0d215de44557372ca41b15f4 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Tue, 30 Jun 2020 09:22:12 +0200
|
|
Subject: [PATCH 01/32] ucm: substitution - remove duplicate allow_empty
|
|
assignment
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/ucm/ucm_subs.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/ucm/ucm_subs.c b/src/ucm/ucm_subs.c
|
|
index a154aa510ee8..d40e5478b084 100644
|
|
--- a/src/ucm/ucm_subs.c
|
|
+++ b/src/ucm/ucm_subs.c
|
|
@@ -303,7 +303,6 @@ __std:
|
|
} else if (value[1] != '{') {
|
|
goto __std;
|
|
}
|
|
- allow_empty = false;
|
|
fcn2 = NULL;
|
|
MATCH_VARIABLE(value, "${OpenName}", rval_open_name, false);
|
|
MATCH_VARIABLE(value, "${ConfTopDir}", rval_conf_topdir, false);
|
|
@@ -365,7 +364,8 @@ __rval:
|
|
}
|
|
strncpy(r, value, idsize);
|
|
r[idsize] = '\0';
|
|
- uc_error("variable '%s' is not defined in this context!", r);
|
|
+ uc_error("variable '%s' is %s in this context!", r,
|
|
+ rval ? "empty" : "not defined");
|
|
err = -EINVAL;
|
|
goto __error;
|
|
}
|
|
--
|
|
2.16.4
|
|
|