Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15f6b09a authored by Daniel Mack's avatar Daniel Mack Committed by Mark Brown
Browse files

ASoC: soc-compress: consolidate two identical branches 



The actions taken in both branches are identical, so we can simplify the
code. Spotted by Coverity.

Signed-off-by: default avatarDaniel Mack <daniel@zonque.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f114040e

sound/soc/soc-compress.c

+2 −9
Original line number Diff line number Diff line
@@ -258,9 +258,6 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) 
	list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be)

		dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE;



	if (stream == SNDRV_PCM_STREAM_PLAYBACK)

		dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_STOP);

	else

	dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_STOP);



	fe->dpcm[stream].state = SND_SOC_DPCM_STATE_CLOSE;
@@ -456,11 +453,7 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream, 
	if (ret < 0)

		goto out;



	if (stream == SNDRV_PCM_STREAM_PLAYBACK)

	dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_START);

	else

		dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_START);



	fe->dpcm[stream].state = SND_SOC_DPCM_STATE_PREPARE;



out: