瀏覽代碼

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 <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Mark Brown 13 年之前
父節點
當前提交
62d4a4b99d
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      sound/soc/soc-dapm.c

+ 4 - 4
sound/soc/soc-dapm.c

@@ -2276,15 +2276,15 @@ err:
 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);
-		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",
 			dev_err(dapm->dev, "Failed to add route %s->%s\n",
 				route->source, route->sink);
 				route->source, route->sink);
-			break;
+			ret = r;
 		}
 		}
 		route++;
 		route++;
 	}
 	}