diff options
| author | Mark Brown <broonie@kernel.org> | 2023-03-30 02:14:00 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-03-30 02:14:00 +0300 |
| commit | 461b56f26119b9fc47a83113a59c05be05e4c6fa (patch) | |
| tree | 662dd2bdb57ec2d719f4e169f80ebd797b2ae394 /sound/soc/soc-pcm.c | |
| parent | f769fcefa683e150456555e2a280668509d834df (diff) | |
| parent | e3720f92e0237921da537e47a0b24e27899203f8 (diff) | |
| download | linux-461b56f26119b9fc47a83113a59c05be05e4c6fa.tar.xz | |
ASoC: Merge fixes
So they can be used as a basis for new work.
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 b7f8a5bcfbc6..b830a53ceacb 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1662,10 +1662,14 @@ static void dpcm_runtime_setup_fe(struct snd_pcm_substream *substream) struct snd_pcm_hardware *hw = &runtime->hw; struct snd_soc_dai *dai; int stream = substream->stream; + u64 formats = hw->formats; int i; soc_pcm_hw_init(hw); + if (formats) + hw->formats &= formats; + for_each_rtd_cpu_dais(fe, i, dai) { struct snd_soc_pcm_stream *cpu_stream; |