From 719539603d394c050303b06fa43702ed7ca4e350 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 22 Jun 2012 12:21:49 +0100
Subject: [PATCH] --- yaml --- r: 316262 b: refs/heads/master c:
 62d4a4b99dfd647ef88b8434334eaa7497602857 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/sound/soc/soc-dapm.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d5589ffb4716..2f00188bc4b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 229e3fdc1ba49b747e9434b55b3f6bd68a4db251
+refs/heads/master: 62d4a4b99dfd647ef88b8434334eaa7497602857
diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c
index 7365fed1ba74..32fbf10127f1 100644
--- a/trunk/sound/soc/soc-dapm.c
+++ b/trunk/sound/soc/soc-dapm.c
@@ -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++;
 	}