summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-pcm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-08-08 17:32:10 +0100
committerMark Brown <broonie@kernel.org>2018-08-08 17:32:10 +0100
commit35ef57a4190d4253b73720cf0402158eda0f1bc8 (patch)
treef7346839cbfe76beb8c09a6f0f6c5012cc28cff8 /sound/soc/soc-pcm.c
parent0a047f07525fecfa8f6fccc5d30afff7e816de8d (diff)
parent0717edbdfed61b4c1e8291140f78882d3a481042 (diff)
downloadlinux-35ef57a4190d4253b73720cf0402158eda0f1bc8.tar.bz2
Merge branch 'asoc-4.18' into asoc-4.19 wmadsp dep
Diffstat (limited to 'sound/soc/soc-pcm.c')
-rw-r--r--sound/soc/soc-pcm.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 9833e53754cb..e8b98bfd4cf1 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1712,6 +1712,14 @@ static void dpcm_runtime_merge_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;