diff options
| author | Mark Brown <broonie@kernel.org> | 2021-02-05 15:01:21 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-02-05 15:01:21 +0000 |
| commit | 2927e6d398d0fca52d8f011a89dcfcabb2b1abfd (patch) | |
| tree | 30ddd4cddded855db423c290512d7be7c13dc9db /sound/soc/sof/topology.c | |
| parent | 6395a6213b8367bb55c3b940f663eda772d7c19c (diff) | |
| parent | b976a5adf32eee7db928b5b77cffa3b008ebf2ff (diff) | |
| download | linux-2927e6d398d0fca52d8f011a89dcfcabb2b1abfd.tar.bz2 | |
Merge branch 'asoc-5.11' into asoc-5.12
Diffstat (limited to 'sound/soc/sof/topology.c')
| -rw-r--r-- | sound/soc/sof/topology.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index b69f493b5faa..d6e1f33eb1e9 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1073,7 +1073,7 @@ static int sof_control_load_volume(struct snd_soc_component *scomp, scontrol->cmd = SOF_CTRL_CMD_VOLUME; /* extract tlv data */ - if (get_tlv_data(kc->tlv.p, tlv) < 0) { + if (!kc->tlv.p || get_tlv_data(kc->tlv.p, tlv) < 0) { dev_err(scomp->dev, "error: invalid TLV data\n"); ret = -EINVAL; goto out_free; @@ -3732,6 +3732,8 @@ int snd_sof_load_topology(struct snd_soc_component *scomp, const char *file) if (ret < 0) { dev_err(scomp->dev, "error: tplg request firmware %s failed err: %d\n", file, ret); + dev_err(scomp->dev, + "you may need to download the firmware from https://github.com/thesofproject/sof-bin/\n"); return ret; } |