]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ASoC: simple-card-utils: fixup simple_util_startup() error handling
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 19 Sep 2023 01:22:57 +0000 (01:22 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Oct 2023 21:08:51 +0000 (23:08 +0200)
commit 69cf63b6560205a390a736b88d112374655adb28 upstream.

It should use "goto" instead of "return"

Fixes: 5ca2ab459817 ("ASoC: simple-card-utils: Add new system-clock-fixed flag")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/all/202309141205.ITZeDJxV-lkp@intel.com/
Closes: https://lore.kernel.org/all/202309151840.au9Aa2W4-lkp@intel.com/
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87v8c76jnz.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/generic/simple-card-utils.c

index 8811321717fbb81e0083a633775961da07c81d9a..c719354635a3a7ba3aecf9b7e109dd863d0ae550 100644 (file)
@@ -331,7 +331,8 @@ int asoc_simple_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);