mux: ipc3: enforce mux_mix_check result

abonislawski · abonislawski · commit 0c6ba922faa2 · 2026-06-12T16:15:32.000+02:00
mux_set_values() logged a mux_mix_check() failure
but still returned success, applying an invalid
routing matrix. Return -EINVAL, matching the IPC4 path.

Signed-off-by: Adrian Bonislawski &lt;adrian.bonislawski@intel.com&gt;
diff --git a/src/audio/mux/mux_ipc3.c b/src/audio/mux/mux_ipc3.c
@@ -70,8 +70,10 @@ static int mux_set_values(struct processing_module *mod)
 	}
 
 	if (cd->comp_type == SOF_COMP_MUX) {
-		if (mux_mix_check(cfg))
+		if (mux_mix_check(cfg)) {
 			comp_err(dev, "mux component is not able to mix channels");
+			return -EINVAL;
+		}
 	}
 
 	for (i = 0; i < cfg->num_streams; i++) {
diff --git a/src/audio/mux/mux_ipc4.c b/src/audio/mux/mux_ipc4.c
@@ -157,8 +157,6 @@ int mux_params(struct processing_module *mod)
 	if (ret < 0)
 		return ret;
 
-	ret = set_mux_params(mod, cfg);
-
-	return ret;
+	return set_mux_params(mod, cfg);
 }
 #endif /* CONFIG_COMP_MUX */

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,10 @@ static int mux_set_values(struct processing_module *mod)`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`if (cd->comp_type == SOF_COMP_MUX) {`
`73`		`- if (mux_mix_check(cfg))`
	`73`	`+ if (mux_mix_check(cfg)) {`
`74`	`74`	`comp_err(dev, "mux component is not able to mix channels");`
	`75`	`+ return -EINVAL;`
	`76`	`+ }`
`75`	`77`	`}`
`76`	`78`
`77`	`79`	`for (i = 0; i < cfg->num_streams; i++) {`
Original file line number	Diff line number	Diff line change
`@@ -157,8 +157,6 @@ int mux_params(struct processing_module *mod)`
`157`	`157`	`if (ret < 0)`
`158`	`158`	`return ret;`
`159`	`159`
`160`		`- ret = set_mux_params(mod, cfg);`
`161`		`-`
`162`		`- return ret;`
	`160`	`+ return set_mux_params(mod, cfg);`
`163`	`161`	`}`
`164`	`162`	`#endif /* CONFIG_COMP_MUX */`