diff options
| author | Cezary Rojewski <cezary.rojewski@intel.com> | 2021-08-18 09:57:42 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-08-23 16:40:05 +0100 |
| commit | b947d2b467c0ea275ac3b468974ebe0dd0c0c3bd (patch) | |
| tree | 7fd59210b2f755d481c288adb8cf8709ba396ccf /sound/soc/intel/skylake | |
| parent | 5b27a71cbbfe6ffb554c87fde2ad9b71841478c2 (diff) | |
| download | lwn-b947d2b467c0ea275ac3b468974ebe0dd0c0c3bd.tar.gz lwn-b947d2b467c0ea275ac3b468974ebe0dd0c0c3bd.zip | |
ASoC: Intel: Skylake: Select first entry for singular pipe config arrays
When pipe does not expose multiple configuration options, always select
the first entry without searching for matching one.
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Tested-by: Lukasz Majczak <lma@semihalf.com>
Link: https://lore.kernel.org/r/20210818075742.1515155-12-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/skylake')
| -rw-r--r-- | sound/soc/intel/skylake/skl-topology.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 04fbf83f3835..b036852d6889 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -640,8 +640,9 @@ skl_tplg_get_pipe_config(struct skl_dev *skl, struct skl_module_cfg *mconfig) return 0; } - if (pipe->conn_type == SKL_PIPE_CONN_TYPE_NONE) { - dev_dbg(skl->dev, "No conn_type detected, take 0th config\n"); + if (pipe->conn_type == SKL_PIPE_CONN_TYPE_NONE || pipe->nr_cfgs == 1) { + dev_dbg(skl->dev, "No conn_type or just 1 pathcfg, taking 0th for %d\n", + pipe->ppl_id); pipe->cur_config_idx = 0; pipe->memory_pages = pconfig->mem_pages; |