diff options
author | Mark Brown <broonie@kernel.org> | 2019-05-06 15:51:54 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-05-06 15:51:54 +0200 |
commit | 378d590c494551a68a824b939c711bb9a280e9ef (patch) | |
tree | 7481e5902a89c9814666bdc45a3ff9f43f1c4450 /sound/soc/soc-pcm.c | |
parent | Merge branch 'asoc-5.1' into asoc-linus (diff) | |
parent | ASoC: sprd: Add reserved DMA memory support (diff) | |
download | linux-378d590c494551a68a824b939c711bb9a280e9ef.tar.xz linux-378d590c494551a68a824b939c711bb9a280e9ef.zip |
Merge branch 'asoc-5.2' into asoc-next
Diffstat (limited to 'sound/soc/soc-pcm.c')
-rw-r--r-- | sound/soc/soc-pcm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 69ea962de585..0a4f60c7a188 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2172,6 +2172,10 @@ int dpcm_be_dai_hw_params(struct snd_soc_pcm_runtime *fe, int stream) } } + /* copy the fixed-up hw params for BE dai */ + memcpy(&be->dpcm[stream].hw_params, &dpcm->hw_params, + sizeof(struct snd_pcm_hw_params)); + /* only allow hw_params() if no connected FEs are running */ if (!snd_soc_dpcm_can_be_params(fe, be, stream)) continue; |