Unverified Commit 1c531230 authored Feb 21, 2020 by Kuninori Morimoto Committed by Mark Brown Feb 24, 2020

ASoC: soc-pcm/soc-compress: don't use snd_soc_dapm_stream_stop()



commit b0edff42 ("ASoC: soc-pcm/soc-compress: use
snd_soc_dapm_stream_stop() for SND_SOC_DAPM_STREAM_STOP")
uses snd_soc_dapm_stream_stop() for soc_compr_free_fe()
and dpcm_fe_dai_shutdown() because it didn't care about pmdown_time.
But, it didn't need to care.
This patch rollback to original code.
Some system will wait unneeded timed-out without this patch.
Special Thanks for reporting to Chris Gorman.
	...
	intel_sst_acpi 808622A8:00: Wait timed-out condition:0x0, msg_id:0x1 fw_state 0x3
	intel_sst_acpi 808622A8:00: fw returned err -16
	sst-mfld-platform sst-mfld-platform: ASoC: PRE_PMD: pcm0_in event failed: -16
	...

Fixes: commit b0edff42 ("ASoC: soc-pcm/soc-compress: use snd_soc_dapm_stream_stop() for SND_SOC_DAPM_STREAM_STOP")
Reported-by: Chris Gorman <chrisjohgorman@gmail.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87lfowspeb.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 22946f37

sound/soc/soc-compress.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -299,7 +299,7 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream)
		for_each_dpcm_be(fe, stream, dpcm)
		dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE;

		snd_soc_dapm_stream_stop(fe, stream);
		dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_STOP);

		fe->dpcm[stream].state = SND_SOC_DPCM_STATE_CLOSE;
		fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;

sound/soc/soc-pcm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2006,7 +2006,7 @@ static int dpcm_fe_dai_shutdown(struct snd_pcm_substream *substream)
		soc_pcm_close(substream);

		/* run the stream event for each BE */
		snd_soc_dapm_stream_stop(fe, stream);
		dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_STOP);

		fe->dpcm[stream].state = SND_SOC_DPCM_STATE_CLOSE;
		dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);

Admin message