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

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
...@@ -2276,15 +2276,15 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, ...@@ -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, int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm,
const struct snd_soc_dapm_route *route, int num) 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); mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_INIT);
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
ret = snd_soc_dapm_add_route(dapm, route); r = snd_soc_dapm_add_route(dapm, route);
if (ret < 0) { if (r < 0) {
dev_err(dapm->dev, "Failed to add route %s->%s\n", dev_err(dapm->dev, "Failed to add route %s->%s\n",
route->source, route->sink); route->source, route->sink);
break; ret = r;
} }
route++; route++;
} }
......
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