From: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Date: Sun, 13 Jun 2021 03:27:19 +0000 (-0700)
Subject: pre-process-object: skip parent update if parent is NULL
X-Git-Tag: v1.2.6~32
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=3c81766242e7ca1b7a59e4d3061b2813394bebc8;p=alsa-utils.git

pre-process-object: skip parent update if parent is NULL

Nothing to do for top-level objects with no parent.
Also, add access to the bytes control template.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/topology/pre-process-object.c b/topology/pre-process-object.c
index b527b22..e476946 100644
--- a/topology/pre-process-object.c
+++ b/topology/pre-process-object.c
@@ -87,6 +87,10 @@ int tplg_parent_update(struct tplg_pre_processor *tplg_pp, snd_config_t *parent,
 	char *item_id;
 	int ret, id = 0;
 
+	/* Nothing to do if parent is NULL */
+	if (!parent)
+		return 0;
+
 	child = tplg_object_get_instance_config(tplg_pp, parent);
 	ret = snd_config_search(child, "name", &cfg);
 	if (ret < 0) {
@@ -963,6 +967,7 @@ const struct config_template_items mixer_control_config = {
 
 const struct config_template_items bytes_control_config = {
 	.int_config_ids = {"index", "base", "num_regs", "max", "mask"},
+	.compound_config_ids = {"access"}
 };
 
 const struct config_template_items scale_config = {