diff options
| author | Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> | 2023-01-28 00:11:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-01-30 16:56:36 +0000 |
| commit | d9b07b790a5c47dd4fd66c9264a3b38a103fa09b (patch) | |
| tree | f122dc9b018d3bf7fc4d4630d3869129a0802122 /sound/soc/soc-topology.c | |
| parent | b784617a407c4f7e079e1694c3161ab29eb4bab1 (diff) | |
| download | linux-stable-d9b07b790a5c47dd4fd66c9264a3b38a103fa09b.tar.gz linux-stable-d9b07b790a5c47dd4fd66c9264a3b38a103fa09b.tar.bz2 linux-stable-d9b07b790a5c47dd4fd66c9264a3b38a103fa09b.zip | |
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: Cezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20230127231111.937721-10-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-topology.c')
| -rw-r--r-- | sound/soc/soc-topology.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 08dd55f94584..6689cf44464c 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -2389,9 +2389,6 @@ static int soc_tplg_manifest_load(struct soc_tplg *tplg, static int soc_tplg_valid_header(struct soc_tplg *tplg, 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)) { dev_err(tplg->dev, "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, return -EINVAL; } - return 1; + return 0; } /* check header type and call appropriate handler */ @@ -2528,8 +2525,6 @@ static int soc_tplg_process_headers(struct soc_tplg *tplg) dev_err(tplg->dev, "ASoC: topology: invalid header: %d\n", ret); return ret; - } else if (ret == 0) { - break; } /* load the header object */ |