From 3eba87a87b8e3d773b33cfdeaa99ba8715040b0e Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Sat, 14 Jul 2012 18:43:04 +0200
Subject: [PATCH] --- yaml --- r: 315416 b: refs/heads/master c:
 da78b7998e365b3f90b2a1a55d3b6ba6cc0c5905 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/can/softing/softing_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cfbfe7f6f117..3f9bde07cd1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e84eb0b8a04b95b66aae652f947cbadffc6a25c
+refs/heads/master: da78b7998e365b3f90b2a1a55d3b6ba6cc0c5905
diff --git a/trunk/drivers/net/can/softing/softing_main.c b/trunk/drivers/net/can/softing/softing_main.c
index a7c77c744ee9..f2a221e7b968 100644
--- a/trunk/drivers/net/can/softing/softing_main.c
+++ b/trunk/drivers/net/can/softing/softing_main.c
@@ -826,12 +826,12 @@ static __devinit int softing_pdev_probe(struct platform_device *pdev)
 		goto sysfs_failed;
 	}
 
-	ret = -ENOMEM;
 	for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
 		card->net[j] = netdev =
 			softing_netdev_create(card, card->id.chip[j]);
 		if (!netdev) {
 			dev_alert(&pdev->dev, "failed to make can[%i]", j);
+			ret = -ENOMEM;
 			goto netdev_failed;
 		}
 		priv = netdev_priv(card->net[j]);