commit 9f0af69b2dd34d2c21817d599db7bdb3c972a759
author Nikanth Karthikesan <knikanth@suse.de> Thu Mar 24 11:46:18 2011 +0530
committer Jiri Kosina <jkosina@suse.cz> Sun Apr 10 17:01:05 2011 +0200
tree 68f76d50a1dc4d5393175904bb22338c44f012ac
parent 06794eaeb766989e450c1b459ae28da76e1f8719

sysfs-memory: fix uninitialized variable warning and clean-up code.

sysfs-memory: Fix uninitialized variable warning and clean-up code.

Signed-off-by: Nikanth Karthikesan <knikanth@suse.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

drivers/base/memory.c

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 3da6a43..89ffb44 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -396,15 +396,14 @@
 		ret = add_memory(nid, phys_addr,
 				 PAGES_PER_SECTION << PAGE_SHIFT);
 		if (ret)
-			break;
+			goto out;
 
 		phys_addr += MIN_MEMORY_BLOCK_SIZE;
 	}
 
-	if (ret)
-		count = ret;
-
-	return count;
+	ret = count;
+out:
+	return ret;
 }
 static CLASS_ATTR(probe, S_IWUSR, NULL, memory_probe_store);