Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62d4a4b9 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: dapm: Try to add all routes even if one fails 



We may as well print as many errors as we can in one go rather than
requiring developers to iterate through all their typos.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent 229e3fdc

sound/soc/soc-dapm.c

+4 −4
Original line number Diff line number Diff line
@@ -2276,15 +2276,15 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, 
int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm,

			    const struct snd_soc_dapm_route *route, int num)

{

	int i, ret = 0;

	int i, r, ret = 0;



	mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_INIT);

	for (i = 0; i < num; i++) {

		ret = snd_soc_dapm_add_route(dapm, route);

		if (ret < 0) {

		r = snd_soc_dapm_add_route(dapm, route);

		if (r < 0) {

			dev_err(dapm->dev, "Failed to add route %s->%s\n",

				route->source, route->sink);

			break;

			ret = r;

		}

		route++;

	}