Commit d9b07b79 authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Mark Brown

ASoC: topology: Remove unnecessary check for EOF

Caller already checks if hdr_pos is behind EOF, before calling
soc_tplg_valid_header(), so there is no need to recheck it again. This
also allows to remove behaviour of return 0 - forcing the caller to
break out of while loop.
Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20230127231111.937721-10-amadeuszx.slawinski@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent b784617a
...@@ -2389,9 +2389,6 @@ static int soc_tplg_manifest_load(struct soc_tplg *tplg, ...@@ -2389,9 +2389,6 @@ static int soc_tplg_manifest_load(struct soc_tplg *tplg,
static int soc_tplg_valid_header(struct soc_tplg *tplg, static int soc_tplg_valid_header(struct soc_tplg *tplg,
struct snd_soc_tplg_hdr *hdr) struct snd_soc_tplg_hdr *hdr)
{ {
if (soc_tplg_get_hdr_offset(tplg) >= tplg->fw->size)
return 0;
if (le32_to_cpu(hdr->size) != sizeof(*hdr)) { if (le32_to_cpu(hdr->size) != sizeof(*hdr)) {
dev_err(tplg->dev, dev_err(tplg->dev,
"ASoC: invalid header size for type %d at offset 0x%lx size 0x%zx.\n", "ASoC: invalid header size for type %d at offset 0x%lx size 0x%zx.\n",
...@@ -2442,7 +2439,7 @@ static int soc_tplg_valid_header(struct soc_tplg *tplg, ...@@ -2442,7 +2439,7 @@ static int soc_tplg_valid_header(struct soc_tplg *tplg,
return -EINVAL; return -EINVAL;
} }
return 1; return 0;
} }
/* check header type and call appropriate handler */ /* check header type and call appropriate handler */
...@@ -2528,8 +2525,6 @@ static int soc_tplg_process_headers(struct soc_tplg *tplg) ...@@ -2528,8 +2525,6 @@ static int soc_tplg_process_headers(struct soc_tplg *tplg)
dev_err(tplg->dev, dev_err(tplg->dev,
"ASoC: topology: invalid header: %d\n", ret); "ASoC: topology: invalid header: %d\n", ret);
return ret; return ret;
} else if (ret == 0) {
break;
} }
/* load the header object */ /* load the header object */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment