diff options
| author | Mark Brown <broonie@kernel.org> | 2023-09-26 16:14:44 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-09-26 16:14:44 +0200 |
| commit | af08458988cb5dd4b4ff87cfb9da81c6d2c8ef7a (patch) | |
| tree | 5a71f1c4e3099d7cfe4c6f880e707173b6ec9cda /sound/soc/generic | |
| parent | e952e89b0602aeb856396eac4306098249c43548 (diff) | |
| parent | 2b21207afd06714986a3d22442ed4860ba4f9ced (diff) | |
ASoC: Merge up fixes
For the benefit of CI.
Diffstat (limited to 'sound/soc/generic')
| -rw-r--r-- | sound/soc/generic/simple-card-utils.c | 3 | ||||
| -rw-r--r-- | sound/soc/generic/simple-card.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 36ce3a4343f9..11f186ea662a 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -310,7 +310,8 @@ int simple_util_startup(struct snd_pcm_substream *substream) if (fixed_sysclk % props->mclk_fs) { dev_err(rtd->dev, "fixed sysclk %u not divisible by mclk_fs %u\n", fixed_sysclk, props->mclk_fs); - return -EINVAL; + ret = -EINVAL; + goto codec_err; } ret = snd_pcm_hw_constraint_minmax(substream->runtime, SNDRV_PCM_HW_PARAM_RATE, fixed_rate, fixed_rate); diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index a88812ab3ed1..b95b86315502 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -758,10 +758,12 @@ static int simple_probe(struct platform_device *pdev) struct snd_soc_dai_link *dai_link = priv->dai_link; struct simple_dai_props *dai_props = priv->dai_props; + ret = -EINVAL; + cinfo = dev->platform_data; if (!cinfo) { dev_err(dev, "no info for asoc-simple-card\n"); - return -EINVAL; + goto err; } if (!cinfo->name || @@ -770,7 +772,7 @@ static int simple_probe(struct platform_device *pdev) !cinfo->platform || !cinfo->cpu_dai.name) { dev_err(dev, "insufficient simple_util_info settings\n"); - return -EINVAL; + goto err; } cpus = dai_link->cpus; |