diff options
| author | Mark Brown <broonie@kernel.org> | 2021-02-17 18:52:25 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-02-17 18:52:25 +0000 |
| commit | 3b9b1490e098f4847a215d2be6a66fbb891bfc7a (patch) | |
| tree | aacd0777b9c0bb1ffa1e560bd3b0ab4bdb45211c /sound/soc/sof/pcm.c | |
| parent | 92bf22614b21a2706f4993b278017e437f7785b3 (diff) | |
| parent | bd8036eb15263a720b8f846861c180b27d050a09 (diff) | |
| download | linux-stable-3b9b1490e098f4847a215d2be6a66fbb891bfc7a.tar.gz linux-stable-3b9b1490e098f4847a215d2be6a66fbb891bfc7a.tar.bz2 linux-stable-3b9b1490e098f4847a215d2be6a66fbb891bfc7a.zip | |
Merge remote-tracking branch 'asoc/for-5.11' into asoc-linus
Diffstat (limited to 'sound/soc/sof/pcm.c')
| -rw-r--r-- | sound/soc/sof/pcm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c index 0dc39fbcd81d..61c3fe17342d 100644 --- a/sound/soc/sof/pcm.c +++ b/sound/soc/sof/pcm.c @@ -707,7 +707,12 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa } break; case SOF_DAI_INTEL_ALH: - /* do nothing for ALH dai_link */ + /* + * Dai could run with different channel count compared with + * front end, so get dai channel count from topology + */ + channels->min = dai->dai_config->alh.channels; + channels->max = dai->dai_config->alh.channels; break; case SOF_DAI_IMX_ESAI: rate->min = dai->dai_config->esai.fsync_rate; |