[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20241122063257.4419-1-zhujun2@cmss.chinamobile.com>
Date: Thu, 21 Nov 2024 22:32:57 -0800
From: Zhu Jun <zhujun2@...s.chinamobile.com>
To: perex@...ex.cz
Cc: tiwai@...e.com,
zhujun2@...s.chinamobile.com,
linux-sound@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] ASoC: Intel: avs: Add error handling in avs_tplg_parse_initial_configs
Introduce error handling in avs_tplg_parse_initial_configs to ensure that
the function returns immediately if parse_dictionary_entries fails.
Signed-off-by: Zhu Jun <zhujun2@...s.chinamobile.com>
---
sound/soc/intel/avs/topology.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/avs/topology.c b/sound/soc/intel/avs/topology.c
index 5cda52702..3f76581af 100644
--- a/sound/soc/intel/avs/topology.c
+++ b/sound/soc/intel/avs/topology.c
@@ -1500,7 +1500,6 @@ static int avs_tplg_parse_initial_configs(struct snd_soc_component *comp,
AVS_TKN_MANIFEST_NUM_INIT_CONFIGS_U32);
if (ret)
return ret;
-
block_size -= le32_to_cpu(tuples->size);
/* With header parsed, move on to parsing entries. */
tuples = avs_tplg_vendor_array_next(tuples);
@@ -1522,6 +1521,8 @@ static int avs_tplg_parse_initial_configs(struct snd_soc_component *comp,
AVS_TKN_MOD_INIT_CONFIG_ID_U32,
mod_init_config_parsers,
ARRAY_SIZE(mod_init_config_parsers));
+ if (ret)
+ return ret;
block_size -= esize;
--
2.17.1
Powered by blists - more mailing lists