From: Cezary Rojewski Date: Wed, 18 Aug 2021 07:57:42 +0000 (+0200) Subject: ASoC: Intel: Skylake: Select first entry for singular pipe config arrays X-Git-Tag: libata-5.15-2021-09-05~44^2^2^2~14^2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b947d2b467c0ea275ac3b468974ebe0dd0c0c3bd;p=linux-2.6-block.git 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 Tested-by: Lukasz Majczak Link: https://lore.kernel.org/r/20210818075742.1515155-12-cezary.rojewski@intel.com Signed-off-by: Mark Brown --- 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;