Unverified Commit bb9dd3ce authored Dec 02, 2020 by Ranjani Sridharan Committed by Mark Brown Dec 07, 2020

ASoC: pcm: send DAPM_STREAM_STOP event in dpcm_fe_dai_shutdown



A recent change removed the call to send the DAPM_STREAM_STOP
event in dpcm_fe_dai_shutdown. But this causes a regression
when a PCM prepare is not paired with a hw_free. So, add
the DAPM_STREAM_STOP event back to dpcm_fe_dai_shutdown()
to fix this.

The new sequence would be:
soc_pcm_prepare()
    -> SND_SOC_DAPM_STREAM_START

soc_pcm_hw_free()
    -> soc_pcm_hw_free()
	-> SND_SOC_DAPM_STREAM_STOP

dpcm_fe_dai_shutdown()
    -> SND_SOC_DAPM_STREAM_STOP

Note that the DAPM_STREAM_STOP will be called twice but it seems
harmless.

Fixes: a27b421f ('ASoC: pcm: call snd_soc_dapm_stream_stop() in soc_pcm_hw_clean')

Reported-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20201202193343.912942-1-ranjani.sridharan@linux.intel.com


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

parent b1b8eb12

sound/soc/soc-pcm.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1860,6 +1860,9 @@ static int dpcm_fe_dai_shutdown(struct snd_pcm_substream *substream)
		/* now shutdown the frontend */
		soc_pcm_close(substream);

		/* run the stream stop event */
		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);
		return 0;

Admin message