Commit 7ac1102b authored by Vlad Karpovich's avatar Vlad Karpovich Committed by Mark Brown

firmware: cs_dsp: Fix new control name check

Before adding a new FW control, its name is checked against
existing controls list. But the string length in strncmp used
to compare controls names is taken from the list, so if beginnings
of the controls are matching,  then the new control is not created.
For example, if CAL_R control already exists, CAL_R_SELECTED
is not created.
The fix is to compare string lengths as well.

Fixes: 64779607 ("ASoC: wm_adsp: Move check for control existence")
Signed-off-by: default avatarVlad Karpovich <vkarpovi@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230815172908.3454056-1-vkarpovi@opensource.cirrus.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 49a4a8d1
...@@ -978,7 +978,8 @@ static int cs_dsp_create_control(struct cs_dsp *dsp, ...@@ -978,7 +978,8 @@ static int cs_dsp_create_control(struct cs_dsp *dsp,
ctl->alg_region.alg == alg_region->alg && ctl->alg_region.alg == alg_region->alg &&
ctl->alg_region.type == alg_region->type) { ctl->alg_region.type == alg_region->type) {
if ((!subname && !ctl->subname) || if ((!subname && !ctl->subname) ||
(subname && !strncmp(ctl->subname, subname, ctl->subname_len))) { (subname && (ctl->subname_len == subname_len) &&
!strncmp(ctl->subname, subname, ctl->subname_len))) {
if (!ctl->enabled) if (!ctl->enabled)
ctl->enabled = 1; ctl->enabled = 1;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment