ASoC: soc-dai: fix DAI startup/shutdown sequence (1ba616bd) · Commits · 戴 / test

The addition of a single flag to track the DAI status prevents the DAI startup sequence from being called on capture if the DAI is already used for playback. Fix by extending the existing code with one flag per direction. Fixes: ("ASoC: soc-pcm: call snd_soc_dai_startup()/shutdown() once") Reported-by:

Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Signed-off-by:

Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Tested-by:

Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Link: https://lore.kernel.org/r/20200330160602.10180-1-pierre-louis.bossart@linux.intel.com Signed-off-by:

Mark Brown <broonie@kernel.org>

include/sound/soc-dai.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -351,7 +351,7 @@ struct snd_soc_dai {

		/* bit field */
		unsigned int probed:1;
		unsigned int started:1;
		unsigned int started[SNDRV_PCM_STREAM_LAST + 1];
		};

		static inline struct snd_soc_pcm_stream *

sound/soc/soc-dai.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -295,12 +295,12 @@ int snd_soc_dai_startup(struct snd_soc_dai *dai,
		{
		int ret = 0;

		if (!dai->started &&
		if (!dai->started[substream->stream] &&
		dai->driver->ops->startup)
		ret = dai->driver->ops->startup(substream, dai);

		if (ret == 0)
		dai->started = 1;
		dai->started[substream->stream] = 1;

		return ret;
		}
		@@ -308,11 +308,11 @@ int snd_soc_dai_startup(struct snd_soc_dai *dai,
		void snd_soc_dai_shutdown(struct snd_soc_dai *dai,
		struct snd_pcm_substream *substream)
		{
		if (dai->started &&
		if (dai->started[substream->stream] &&
		dai->driver->ops->shutdown)
		dai->driver->ops->shutdown(substream, dai);

		dai->started = 0;
		dai->started[substream->stream] = 0;
		}

		int snd_soc_dai_prepare(struct snd_soc_dai *dai,

Admin message