Commit 411db2ab authored by Zhiwei Jiang's avatar Zhiwei Jiang Committed by Mark Brown

ASoC: dapm: Add warnings for widget overwrite when adding route

Currently, in some complex cases, more than one widgets have same
name and registed from differnt dapm context, and route add from
another context too. When snd_soc_dapm_add_route, the previous
registered widget will overwritten by the latest same name widget,
will cause unexpect error. For Asoc framework we cant avoid this
situation and we cant decide which widget that wanted with route.
At least we can give users a notice.
Signed-off-by: default avatarZhiwei Jiang <qq282012236@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 078a85f2
...@@ -2829,6 +2829,8 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, ...@@ -2829,6 +2829,8 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,
char prefixed_sink[80]; char prefixed_sink[80];
char prefixed_source[80]; char prefixed_source[80];
const char *prefix; const char *prefix;
unsigned int sink_ref = 0;
unsigned int source_ref = 0;
int ret; int ret;
prefix = soc_dapm_prefix(dapm); prefix = soc_dapm_prefix(dapm);
...@@ -2862,6 +2864,11 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, ...@@ -2862,6 +2864,11 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,
if (wsource) if (wsource)
break; break;
} }
sink_ref++;
if (sink_ref > 1)
dev_warn(dapm->dev,
"ASoC: sink widget %s overwritten\n",
w->name);
continue; continue;
} }
if (!wsource && !(strcmp(w->name, source))) { if (!wsource && !(strcmp(w->name, source))) {
...@@ -2871,6 +2878,11 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, ...@@ -2871,6 +2878,11 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,
if (wsink) if (wsink)
break; break;
} }
source_ref++;
if (source_ref > 1)
dev_warn(dapm->dev,
"ASoC: source widget %s overwritten\n",
w->name);
} }
} }
/* use widget from another DAPM context if not found from this */ /* use widget from another DAPM context if not found from this */
......
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