diff options
| author |   Mark Brown <broonie@kernel.org> | 2022-04-05 10:29:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-04-05 10:29:12 +0100 |
| commit | 9a2c98418930c60e25b89a140c8b42a8cd6d84a6 (patch) | |
| tree | bac0f7d760c299545b4abfb07e64f202fab6c73a /sound/soc/soc-topology.c | |
| parent | ASoC: ASRC support on Tegra186 and later (diff) | |
| parent | ASoC: cs35l41: Fix a shift-out-of-bounds warning found by UBSAN (diff) | |
| download | linux-dev-9a2c98418930c60e25b89a140c8b42a8cd6d84a6.tar.xz linux-dev-9a2c98418930c60e25b89a140c8b42a8cd6d84a6.zip | |
ASoC: Pull in fixes
cs35l41 is getting some active work and conflicts, plus some of the
fixes are needed for my testing.
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-topology.c')
| -rw-r--r-- | sound/soc/soc-topology.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index ddbc05306a8f..3f9d314fba16 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1402,12 +1402,12 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, template.num_kcontrols = le32_to_cpu(w->num_kcontrols); kc = devm_kcalloc(tplg->dev, le32_to_cpu(w->num_kcontrols), sizeof(*kc), GFP_KERNEL); if (!kc) - goto err; + goto hdr_err; kcontrol_type = devm_kcalloc(tplg->dev, le32_to_cpu(w->num_kcontrols), sizeof(unsigned int), GFP_KERNEL); if (!kcontrol_type) - goto err; + goto hdr_err; for (i = 0; i < le32_to_cpu(w->num_kcontrols); i++) { control_hdr = (struct snd_soc_tplg_ctl_hdr *)tplg->pos; |