diff options
| author | Sameer Pujar <spujar@nvidia.com> | 2021-09-13 22:12:09 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-09-20 13:31:27 +0100 |
| commit | 0c25db3f7621ce39e959e95b8fea240ea2bfff6a (patch) | |
| tree | dc4dbb419007219dd4312df882b7659a3d5a6c41 /sound/soc/soc-pcm.c | |
| parent | 2266721938b9d12ebf4f2cd96b88912ffa4f5e91 (diff) | |
| download | linux-0c25db3f7621ce39e959e95b8fea240ea2bfff6a.tar.bz2 | |
ASoC: soc-pcm: Don't reconnect an already active BE
In some cases, multiple FE components have the same BE component in their
respective DPCM paths. One such example would be a mixer component, which
can receive two or more inputs and sends a mixed output. In such cases,
to avoid reconfiguration of already active DAI (mixer output DAI in this
case), check the BE stream state to filter out the redundancy.
In summary, allow connection of BE if the respective current stream state
is either NEW or CLOSED.
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Link: https://lore.kernel.org/r/1631551342-25469-2-git-send-email-spujar@nvidia.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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 48f71bb81a2f..e30cb5abaf7a 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1395,6 +1395,10 @@ static int dpcm_add_paths(struct snd_soc_pcm_runtime *fe, int stream, if (!fe->dpcm[stream].runtime && !fe->fe_compr) continue; + if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_NEW) && + (be->dpcm[stream].state != SND_SOC_DPCM_STATE_CLOSE)) + continue; + /* newly connected FE and BE */ err = dpcm_be_connect(fe, be, stream); if (err < 0) { |