From: Mark Brown Date: Fri, 22 Jun 2012 11:21:49 +0000 (+0100) Subject: ASoC: dapm: Try to add all routes even if one fails X-Git-Tag: v3.6-rc1~17^2~11^2~61 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=62d4a4b99dfd647ef88b8434334eaa7497602857;p=linux-block.git 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: Mark Brown Acked-by: Liam Girdwood --- diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 7365fed1ba74..32fbf10127f1 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2276,15 +2276,15 @@ err: 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++; }