Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

[mv-sheeva.git] / drivers / base / memory.c

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 0a134a424a37d30a5cf22cf71e649457f2d3a2a6..9f9b2359f718f486ba5336807fcd003ab6bff1f5 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -389,15 +389,14 @@ memory_probe_store(struct class *class, struct class_attribute *attr,
                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);