diff options
| author | Richard Fitzgerald <rf@opensource.cirrus.com> | 2022-11-04 13:22:13 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-11-10 21:01:48 +0000 |
| commit | 39bd801d6908900e9ab0cdc2655150f95ddd4f1a (patch) | |
| tree | 9ebd3800fb3bea9815a306fc715c9af9f69658ac /sound/soc/soc-pcm.c | |
| parent | 0bb8e9b36b5b7f2e77892981ff6c27ee831d8026 (diff) | |
| download | lwn-39bd801d6908900e9ab0cdc2655150f95ddd4f1a.tar.gz lwn-39bd801d6908900e9ab0cdc2655150f95ddd4f1a.zip | |
ASoC: soc-pcm: Don't zero TDM masks in __soc_pcm_open()
The DAI tx_mask and rx_mask are set by snd_soc_dai_set_tdm_slot()
and used by later code that depends on the TDM settings. So
__soc_pcm_open() should not be obliterating those mask values.
The code in __soc_pcm_hw_params() uses these masks to calculate the
active channels so that only the AIF_IN/AIF_OUT widgets for the
active TDM slots are enabled. The zeroing of the masks in
__soc_pcm_open() disables this functionality so all AIF widgets
were enabled even for channels that are not assigned to a TDM slot.
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Fixes: 2e5894d73789 ("ASoC: pcm: Add support for DAI multicodec")
Link: https://lore.kernel.org/r/20221104132213.121847-1-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index fb87d6d23408..8ceded22a3c4 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -822,11 +822,6 @@ static int __soc_pcm_open(struct snd_soc_pcm_runtime *rtd, ret = snd_soc_dai_startup(dai, substream); if (ret < 0) goto err; - - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - dai->tx_mask = 0; - else - dai->rx_mask = 0; } /* Dynamic PCM DAI links compat checks use dynamic capabilities */ |