Unverified Commit 8a01fbf0 authored Mar 06, 2020 by Kuninori Morimoto Committed by Mark Brown Mar 06, 2020

ASoC: soc-pcm: tidyup dulicate handing at dpcm_fe_dai_startup()



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>

parent 0c9ba720

sound/soc/soc-pcm.c

+3 −7

Original line number	Diff line number	Diff line
		@@ -2162,16 +2162,12 @@ 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:
		if (ret < 0)
		dpcm_be_dai_startup_unwind(fe, stream);
		be_err:
		dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);

Admin message