diff options
-rw-r--r-- | include/uapi/sound/asoc.h | 3 | ||||
-rw-r--r-- | sound/soc/soc-topology.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h index 8d9814b17c46..69cae7198b18 100644 --- a/include/uapi/sound/asoc.h +++ b/include/uapi/sound/asoc.h | |||
@@ -83,7 +83,8 @@ | |||
83 | #define SND_SOC_TPLG_NUM_TEXTS 16 | 83 | #define SND_SOC_TPLG_NUM_TEXTS 16 |
84 | 84 | ||
85 | /* ABI version */ | 85 | /* ABI version */ |
86 | #define SND_SOC_TPLG_ABI_VERSION 0x5 | 86 | #define SND_SOC_TPLG_ABI_VERSION 0x5 /* current version */ |
87 | #define SND_SOC_TPLG_ABI_VERSION_MIN 0x4 /* oldest version supported */ | ||
87 | 88 | ||
88 | /* Max size of TLV data */ | 89 | /* Max size of TLV data */ |
89 | #define SND_SOC_TPLG_TLV_SIZE 32 | 90 | #define SND_SOC_TPLG_TLV_SIZE 32 |
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, | |||
2056 | return -EINVAL; | 2056 | return -EINVAL; |
2057 | } | 2057 | } |
2058 | 2058 | ||
2059 | if (hdr->abi != SND_SOC_TPLG_ABI_VERSION) { | 2059 | /* Support ABI from version 4 */ |
2060 | if (hdr->abi > SND_SOC_TPLG_ABI_VERSION | ||
2061 | || hdr->abi < SND_SOC_TPLG_ABI_VERSION_MIN) { | ||
2060 | dev_err(tplg->dev, | 2062 | dev_err(tplg->dev, |
2061 | "ASoC: pass %d invalid ABI version got 0x%x need 0x%x at offset 0x%lx size 0x%zx.\n", | 2063 | "ASoC: pass %d invalid ABI version got 0x%x need 0x%x at offset 0x%lx size 0x%zx.\n", |
2062 | tplg->pass, hdr->abi, | 2064 | tplg->pass, hdr->abi, |