OSDN Git Service

ASoC: soc-pcm: tidyup dulicate handing at dpcm_fe_dai_startup()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 6 Mar 2020 01:09:59 +0000 (10:09 +0900)
committerMark Brown <broonie@kernel.org>
Fri, 6 Mar 2020 14:47:23 +0000 (14:47 +0000)
error handling at dpcm_fe_dai_startup() has duplicate code.
This patch tidyup it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87lfoep9ug.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-pcm.c

index 3a30776..7d787e0 100644 (file)
@@ -2162,17 +2162,13 @@ static int dpcm_fe_dai_startup(struct snd_pcm_substream *fe_substream)
        snd_pcm_limit_hw_rates(runtime);
 
        ret = dpcm_apply_symmetry(fe_substream, stream);
-       if (ret < 0) {
+       if (ret < 0)
                dev_err(fe->dev, "ASoC: failed to apply dpcm symmetry %d\n",
                        ret);
-               goto unwind;
-       }
-
-       dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);
-       return 0;
 
 unwind:
-       dpcm_be_dai_startup_unwind(fe, stream);
+       if (ret < 0)
+               dpcm_be_dai_startup_unwind(fe, stream);
 be_err:
        dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);
        return ret;