Skip to content

Commit b947d2b

Browse files
crojewsk-intelbroonie
authored andcommitted
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 <[email protected]> Tested-by: Lukasz Majczak <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 5b27a71 commit b947d2b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

sound/soc/intel/skylake/skl-topology.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -640,8 +640,9 @@ skl_tplg_get_pipe_config(struct skl_dev *skl, struct skl_module_cfg *mconfig)
640640
return 0;
641641
}
642642

643-
if (pipe->conn_type == SKL_PIPE_CONN_TYPE_NONE) {
644-
dev_dbg(skl->dev, "No conn_type detected, take 0th config\n");
643+
if (pipe->conn_type == SKL_PIPE_CONN_TYPE_NONE || pipe->nr_cfgs == 1) {
644+
dev_dbg(skl->dev, "No conn_type or just 1 pathcfg, taking 0th for %d\n",
645+
pipe->ppl_id);
645646
pipe->cur_config_idx = 0;
646647
pipe->memory_pages = pconfig->mem_pages;
647648

0 commit comments

Comments
 (0)