1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 3da6a43b7756..89ffb4425d1d 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -396,15 +396,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);