mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-26 06:33:19 -04:00
Merge "ASoC: soc-pcm: Fix playback shutdown sequence"
This commit is contained in:
commit
dfcc9e01ba
1 changed files with 10 additions and 0 deletions
|
|
@ -2113,6 +2113,15 @@ static int dpcm_fe_dai_shutdown(struct snd_pcm_substream *substream)
|
|||
|
||||
dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_FE);
|
||||
|
||||
#ifdef CONFIG_AUDIO_QGKI
|
||||
dev_dbg(fe->dev, "ASoC: close FE %s\n", fe->dai_link->name);
|
||||
|
||||
/* now shutdown the frontend */
|
||||
soc_pcm_close(substream);
|
||||
|
||||
/* shutdown the BEs */
|
||||
dpcm_be_dai_shutdown(fe, substream->stream);
|
||||
#else
|
||||
/* shutdown the BEs */
|
||||
dpcm_be_dai_shutdown(fe, substream->stream);
|
||||
|
||||
|
|
@ -2120,6 +2129,7 @@ static int dpcm_fe_dai_shutdown(struct snd_pcm_substream *substream)
|
|||
|
||||
/* now shutdown the frontend */
|
||||
soc_pcm_close(substream);
|
||||
#endif
|
||||
|
||||
/* run the stream event for each BE */
|
||||
dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_STOP);
|
||||
|
|
|
|||
Loading…
Reference in a new issue