From 98a0a2a98ffca4ed929c34d322c8389816a5e8a8 Mon Sep 17 00:00:00 2001 From: Mengdong Lin Date: Fri, 22 Jul 2016 13:12:54 +0800 Subject: topology: Fix the missing referenced elem ptr when merging private data tplg_copy_data() should set the valid referenced data element pointer on success. The caller will double check this pointer for all kinds of references, including controls and data. Signed-off-by: Mengdong Lin Signed-off-by: Takashi Iwai --- src/topology/data.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/topology/data.c b/src/topology/data.c index e81b7f12..59bc9700 100644 --- a/src/topology/data.c +++ b/src/topology/data.c @@ -1049,8 +1049,10 @@ int tplg_copy_data(snd_tplg_t *tplg, struct tplg_elem *elem, tplg_dbg("Data '%s' used by '%s'\n", ref->id, elem->id); /* overlook empty private data */ - if (!ref_elem->data || !ref_elem->data->size) + if (!ref_elem->data || !ref_elem->data->size) { + ref->elem = ref_elem; return 0; + } old_priv = get_priv_data(elem); if (!old_priv) @@ -1074,6 +1076,8 @@ int tplg_copy_data(snd_tplg_t *tplg, struct tplg_elem *elem, ref_elem->compound_elem = 1; memcpy(priv->data + old_priv_data_size, ref_elem->data->data, priv_data_size); + + ref->elem = ref_elem; return 0; } -- cgit v1.2.1