Commit 7aea8a9d authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: rsnd: fixup MIX kctrl registration

Renesas sound device has many IPs and many situations.
If platform/board uses MIXer, situation will be more complex.
To avoid duplicate DVC kctrl registration when MIXer was used,
it had original flags.
But it was issue when sound card was re-binded, because
no one can't cleanup this flags then.

To solve this issue, commit 9c698e84 ("ASoC: rsnd: tidyup
registering method for rsnd_kctrl_new()") checks registered
card->controls, because if card was re-binded, these were cleanuped
automatically. This patch could solve re-binding issue.
But, it start to avoid MIX kctrl.

To solve these issues, we need below.
To avoid card re-binding issue: check registered card->controls
To avoid duplicate DVC registration: check registered rsnd_kctrl_cfg
To allow multiple MIX registration: check registered rsnd_kctrl_cfg
This patch do it.

Fixes: 9c698e84 ("ASoC: rsnd: tidyup registering method for rsnd_kctrl_new()")
Reported-by: default avatarJiada Wang <jiada_wang@mentor.com>
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-By: default avatarJiada Wang <jiada_wang@mentor.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d0b95e6c
...@@ -1526,14 +1526,14 @@ int rsnd_kctrl_new(struct rsnd_mod *mod, ...@@ -1526,14 +1526,14 @@ int rsnd_kctrl_new(struct rsnd_mod *mod,
int ret; int ret;
/* /*
* 1) Avoid duplicate register (ex. MIXer case) * 1) Avoid duplicate register for DVC with MIX case
* 2) re-register if card was rebinded * 2) Allow duplicate register for MIX
* 3) re-register if card was rebinded
*/ */
list_for_each_entry(kctrl, &card->controls, list) { list_for_each_entry(kctrl, &card->controls, list) {
struct rsnd_kctrl_cfg *c = kctrl->private_data; struct rsnd_kctrl_cfg *c = kctrl->private_data;
if (strcmp(kctrl->id.name, name) == 0 && if (c == cfg)
c->mod == mod)
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