Merge "ASoC: pcm: Update RX shutdown sequence" into msm-4.8 (3b51f7d4) · Commits · e / devices / android_kernel_fairphone_FP3

sound/soc/soc-pcm.c

+15 −14

Original line number	Diff line number	Diff line
		@@ -709,6 +709,20 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)

		snd_soc_dai_digital_mute(cpu_dai, 1, substream->stream);

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
		if (snd_soc_runtime_ignore_pmdown_time(rtd)) {
		/* powered down playback stream now */
		snd_soc_dapm_stream_event(rtd,
		SNDRV_PCM_STREAM_PLAYBACK,
		SND_SOC_DAPM_STREAM_STOP);
		} else {
		/* start delayed pop wq here for playback streams */
		rtd->pop_wait = 1;
		queue_delayed_work(system_power_efficient_wq,
		&rtd->delayed_work,
		msecs_to_jiffies(rtd->pmdown_time));
		}
		}
		if (cpu_dai->driver->ops->shutdown)
		cpu_dai->driver->ops->shutdown(substream, cpu_dai);

		@@ -724,20 +738,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
		if (platform->driver->ops && platform->driver->ops->close)
		platform->driver->ops->close(substream);

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
		if (snd_soc_runtime_ignore_pmdown_time(rtd)) {
		/* powered down playback stream now */
		snd_soc_dapm_stream_event(rtd,
		SNDRV_PCM_STREAM_PLAYBACK,
		SND_SOC_DAPM_STREAM_STOP);
		} else {
		/* start delayed pop wq here for playback streams */
		rtd->pop_wait = 1;
		queue_delayed_work(system_power_efficient_wq,
		&rtd->delayed_work,
		msecs_to_jiffies(rtd->pmdown_time));
		}
		} else {
		if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) {
		/* capture streams can be powered down now */
		snd_soc_dapm_stream_event(rtd, SNDRV_PCM_STREAM_CAPTURE,
		SND_SOC_DAPM_STREAM_STOP);