ASoC: audio-graph-card2: fix index check on graph_parse_node_multi_nm()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 12 Jan 2024 06:10:15 +0000 (06:10 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 12 Jan 2024 14:13:53 +0000 (14:13 +0000)
commit d685aea5e0a8 ("ASoC: audio-graph-card2: fix off by one in
graph_parse_node_multi_nm()") uses ">=" instead of ">" for index check,
but it was wrong. The nm_idx will be increment at end of loop,
thus, ">" is correct.

while (1) {
...
=> if (*nm_idx > nm_max)
break;
...
(*nm_idx)++;
}

Without this patch, "Multi-Codec-1" sample on
${LINUX}/sound/soc/generic/audio-graph-card2-custom-sample.dtsi
will be error.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://msgid.link/r/87o7drdqux.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/generic/audio-graph-card2.c

index 9c94677f681a17b65095b9a691dcb13ea5903c0f..62606e20be9a3ec0e9607e4da1acd68e99f9ba1a 100644 (file)
@@ -556,7 +556,7 @@ static int graph_parse_node_multi_nm(struct snd_soc_dai_link *dai_link,
                struct device_node *mcodec_port;
                int codec_idx;
 
-               if (*nm_idx >= nm_max)
+               if (*nm_idx > nm_max)
                        break;
 
                mcpu_ep_n = of_get_next_child(mcpu_port, mcpu_ep_n);