mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
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: b073ed4e21
("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
This commit is contained in:
parent
b66c9b911f
commit
4febced15a
1 changed files with 8 additions and 0 deletions
|
@ -1694,6 +1694,14 @@ static u64 dpcm_runtime_base_format(struct snd_pcm_substream *substream)
|
|||
int 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;
|
||||
if (stream == SNDRV_PCM_STREAM_PLAYBACK)
|
||||
codec_stream = &codec_dai_drv->playback;
|
||||
|
|
Loading…
Reference in a new issue