diff options
| author | Mengdong Lin <mengdong.lin@linux.intel.com> | 2016-11-03 01:03:17 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-11-03 10:27:57 -0600 |
| commit | 288b8da7e992f0b86b283f98e92885781ffdcaee (patch) | |
| tree | a49fea14e44783737f80badfc53c5facc438c1fd /sound | |
| parent | 8f27c4abc2cd7a31adb896a6b4861cdcb921d063 (diff) | |
| download | linux-stable-288b8da7e992f0b86b283f98e92885781ffdcaee.tar.gz linux-stable-288b8da7e992f0b86b283f98e92885781ffdcaee.tar.bz2 linux-stable-288b8da7e992f0b86b283f98e92885781ffdcaee.zip | |
ASoC: topology: Support topology file of ABI v4
Users start to use topology ABI from v4. ABI v5 updated existing manifest
and PCM elements. Two previous patches can support these ABI updates in a
backward compatible way. So if the topology file from user space is
generated by ABI v4, kernel will no longer quit but continue parsing.
Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-topology.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 0f1c8ebf8cda..2f9b64ec5904 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -2056,7 +2056,9 @@ static int soc_valid_header(struct soc_tplg *tplg, return -EINVAL; } - if (hdr->abi != SND_SOC_TPLG_ABI_VERSION) { + /* Support ABI from version 4 */ + if (hdr->abi > SND_SOC_TPLG_ABI_VERSION + || hdr->abi < SND_SOC_TPLG_ABI_VERSION_MIN) { dev_err(tplg->dev, "ASoC: pass %d invalid ABI version got 0x%x need 0x%x at offset 0x%lx size 0x%zx.\n", tplg->pass, hdr->abi, |