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
49 lines
1.4 KiB
Diff
49 lines
1.4 KiB
Diff
From 84c6aeef5ca89c0686ae2a9ed90504010f8fe9e6 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Mon, 31 Aug 2020 14:25:56 +0200
|
|
Subject: [PATCH 28/32] topology: fix sort_config()
|
|
|
|
The temporary config array must be initialized for all compound types.
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/topology/save.c | 14 ++++++--------
|
|
1 file changed, 6 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/src/topology/save.c b/src/topology/save.c
|
|
index 16fd694638ef..631d84b273bf 100644
|
|
--- a/src/topology/save.c
|
|
+++ b/src/topology/save.c
|
|
@@ -143,7 +143,6 @@ static snd_config_t *sort_config(const char *id, snd_config_t *src)
|
|
int index, array, count;
|
|
|
|
if (snd_config_get_type(src) != SND_CONFIG_TYPE_COMPOUND) {
|
|
-
|
|
if (snd_config_copy(&dst, src) >= 0)
|
|
return dst;
|
|
return NULL;
|
|
@@ -155,14 +154,13 @@ static snd_config_t *sort_config(const char *id, snd_config_t *src)
|
|
if (a == NULL)
|
|
return NULL;
|
|
array = snd_config_is_array(src);
|
|
- if (array <= 0) {
|
|
- index = 0;
|
|
- snd_config_for_each(i, next, src) {
|
|
- snd_config_t *s = snd_config_iterator_entry(i);
|
|
- a[index++] = s;
|
|
- }
|
|
- qsort(a, count, sizeof(a[0]), _compar);
|
|
+ index = 0;
|
|
+ snd_config_for_each(i, next, src) {
|
|
+ snd_config_t *s = snd_config_iterator_entry(i);
|
|
+ a[index++] = s;
|
|
}
|
|
+ if (array <= 0)
|
|
+ qsort(a, count, sizeof(a[0]), _compar);
|
|
if (snd_config_make_compound(&dst, id, count == 1)) {
|
|
free(a);
|
|
return NULL;
|
|
--
|
|
2.16.4
|
|
|