Unverified Commit b947d2b4 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

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: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Tested-by: default avatarLukasz Majczak <lma@semihalf.com>
Link: https://lore.kernel.org/r/20210818075742.1515155-12-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5b27a71c

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

+3 −2
Original line number Diff line number Diff line
@@ -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;