Make sure SND_TPLG_INDEX_ALL is used correctly when checking routes so that connecting routes of different indexes does not emit any warnings.

Signed-off-by: Liam Girdwood liam.r.girdwood@linux.intel.com --- src/topology/dapm.c | 4 ++-- src/topology/elem.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/topology/dapm.c b/src/topology/dapm.c index 66892a6..0ddbf96 100644 --- a/src/topology/dapm.c +++ b/src/topology/dapm.c @@ -279,7 +279,7 @@ int tplg_build_routes(snd_tplg_t *tplg)

} if (!tplg_elem_lookup(&tplg->widget_list, route->sink, - SND_TPLG_TYPE_DAPM_WIDGET, elem->index)) { + SND_TPLG_TYPE_DAPM_WIDGET, SND_TPLG_INDEX_ALL)) { SNDERR("warning: undefined sink widget/stream '%s'\n", route->sink); } @@ -302,7 +302,7 @@ int tplg_build_routes(snd_tplg_t *tplg)

} if (!tplg_elem_lookup(&tplg->widget_list, route->source, - SND_TPLG_TYPE_DAPM_WIDGET, elem->index)) { + SND_TPLG_TYPE_DAPM_WIDGET, SND_TPLG_INDEX_ALL)) { SNDERR("warning: Undefined source widget/stream '%s'\n", route->source); } diff --git a/src/topology/elem.c b/src/topology/elem.c index 89a4ac9..9a7c7b7 100644 --- a/src/topology/elem.c +++ b/src/topology/elem.c @@ -123,7 +123,7 @@ struct tplg_elem *tplg_elem_lookup(struct list_head *base, const char* id, return elem; /* SND_TPLG_INDEX_ALL is the default value "0" and applicable for all use cases */ - if ((elem->index != SND_TPLG_INDEX_ALL) + if ((index != SND_TPLG_INDEX_ALL) && (elem->index > index)) break; }