diff options
| author | Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> | 2021-10-15 18:12:57 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-10-29 16:49:45 +0100 |
| commit | 6c504663ba2ee2abeaf5622e27082819326c1bd4 (patch) | |
| tree | c0652c69df56f75acc5045646940a74441497495 /sound/soc | |
| parent | f714fbc1e89a3533b2578e0c90ce4f5c05a57f96 (diff) | |
| download | linux-6c504663ba2ee2abeaf5622e27082819326c1bd4.tar.gz linux-6c504663ba2ee2abeaf5622e27082819326c1bd4.tar.bz2 linux-6c504663ba2ee2abeaf5622e27082819326c1bd4.zip | |
ASoC: Stop dummy from overriding hwparams
In case that there are other components assigned to runtime device,
depending on order dummy component can override their params with its
own, which shouldn't happen. Check if there are any other components
assigned to rtd and if so, skip setting hwparams.
Occurs when using topology where 'snd-soc-dummy' gets assigned by
default as codec and platform component.
Alternative approach would be to copy whole dummy handling and rename it
to "snd-soc-null" or something similar. And remove hwparams assignment
to make it really do nothing.
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20211015161257.27052-7-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-utils.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c index 299b5d6ebfd1..a4efe7e52a8b 100644 --- a/sound/soc/soc-utils.c +++ b/sound/soc/soc-utils.c @@ -63,10 +63,23 @@ static const struct snd_pcm_hardware dummy_dma_hardware = { .periods_max = 128, }; + +static const struct snd_soc_component_driver dummy_platform; + static int dummy_dma_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + int i; + + /* + * If there are other components associated with rtd, we shouldn't + * override their hwparams + */ + for_each_rtd_components(rtd, i, component) { + if (component->driver == &dummy_platform) + return 0; + } /* BE's dont need dummy params */ if (!rtd->dai_link->no_pcm) |