ASoC: dapm: Add warnings for widget overwrite when adding route (411db2ab) · Commits · 戴 / test

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:

Zhiwei Jiang <qq282012236@gmail.com> Signed-off-by:

Mark Brown <broonie@kernel.org>

sound/soc/soc-dapm.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -2829,6 +2829,8 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,
		char prefixed_sink[80];
		char prefixed_source[80];
		const char *prefix;
		unsigned int sink_ref = 0;
		unsigned int source_ref = 0;
		int ret;

		prefix = soc_dapm_prefix(dapm);
		@@ -2862,6 +2864,11 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,
		if (wsource)
		break;
		}
		sink_ref++;
		if (sink_ref > 1)
		dev_warn(dapm->dev,
		"ASoC: sink widget %s overwritten\n",
		w->name);
		continue;
		}
		if (!wsource && !(strcmp(w->name, source))) {
		@@ -2871,6 +2878,11 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,
		if (wsink)
		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 */

Admin message