Unverified Commit 4febced1 authored Jun 27, 2018 by Jerome Brunet Committed by Mark Brown Jun 28, 2018

ASoC: dpcm: don't merge format from invalid codec dai



When merging codec formats, dpcm_runtime_base_format() should skip
the codecs which are not supporting the current stream direction.

At the moment, if a BE link has more than one codec, and only one
of these codecs has no capture DAI, it becomes impossible to start
a capture stream because the merged format would be 0.

Skipping invalid codec DAI solves the problem.

Fixes: b073ed4e ("ASoC: soc-pcm: DPCM cares BE format")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org

parent b66c9b91

sound/soc/soc-pcm.c

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1694,6 +1694,14 @@ static u64 dpcm_runtime_base_format(struct snd_pcm_substream *substream)
	int i;		int i;

	for (i = 0; i < be->num_codecs; i++) {		for (i = 0; i < be->num_codecs; i++) {
			/*
			* Skip CODECs which don't support the current stream
			* type. See soc_pcm_init_runtime_hw() for more details
			*/
			if (!snd_soc_dai_stream_valid(be->codec_dais[i],
			stream))
			continue;

	codec_dai_drv = be->codec_dais[i]->driver;		codec_dai_drv = be->codec_dais[i]->driver;
	if (stream == SNDRV_PCM_STREAM_PLAYBACK)		if (stream == SNDRV_PCM_STREAM_PLAYBACK)
	codec_stream = &codec_dai_drv->playback;		codec_stream = &codec_dai_drv->playback;