Unverified Commit 301bda18 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: audio-graph-card2: fix index check on graph_parse_node_multi_nm() 



commit d685aea5 ("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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://msgid.link/r/87o7drdqux.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/generic/audio-graph-card2.c

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