Merge "ASoC: pcm: update the start-up sequence for playback" (824167f1) · Commits · e / devices / android_kernel_fairphone_FP5

sound/soc/soc-pcm.c

+22 −2

Original line number	Diff line number	Diff line
		@@ -801,6 +801,11 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)

		mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
		snd_soc_dapm_stream_event(rtd,
		SNDRV_PCM_STREAM_PLAYBACK,
		SND_SOC_DAPM_STREAM_START);

		if (rtd->dai_link->ops->prepare) {
		ret = rtd->dai_link->ops->prepare(substream);
		if (ret < 0) {
		@@ -845,8 +850,15 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
		cancel_delayed_work(&rtd->delayed_work);
		}

		snd_soc_dapm_stream_event(rtd, substream->stream,
		if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
		for (i = 0; i < rtd->num_codecs; i++) {
		codec_dai = rtd->codec_dais[i];
		if (codec_dai->capture_active == 1)
		snd_soc_dapm_stream_event(rtd,
		SNDRV_PCM_STREAM_CAPTURE,
		SND_SOC_DAPM_STREAM_START);
		}
		}

		for_each_rtd_codec_dai(rtd, i, codec_dai)
		snd_soc_dai_digital_mute(codec_dai, 0,
		@@ -854,7 +866,15 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
		snd_soc_dai_digital_mute(cpu_dai, 0, substream->stream);

		out:
		if (ret < 0 && substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
		pr_err("%s: Issue stop stream for codec_dai due to op failure %d = ret\n",
		__func__, ret);
		snd_soc_dapm_stream_event(rtd,
		SNDRV_PCM_STREAM_PLAYBACK,
		SND_SOC_DAPM_STREAM_STOP);
		}
		mutex_unlock(&rtd->card->pcm_mutex);

		return ret;
		}