diff options
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/memory.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 3da6a43b775..89ffb4425d1 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, | |||
| 396 | ret = add_memory(nid, phys_addr, | 396 | ret = add_memory(nid, phys_addr, |
| 397 | PAGES_PER_SECTION << PAGE_SHIFT); | 397 | PAGES_PER_SECTION << PAGE_SHIFT); |
| 398 | if (ret) | 398 | if (ret) |
| 399 | break; | 399 | goto out; |
| 400 | 400 | ||
| 401 | phys_addr += MIN_MEMORY_BLOCK_SIZE; | 401 | phys_addr += MIN_MEMORY_BLOCK_SIZE; |
| 402 | } | 402 | } |
| 403 | 403 | ||
| 404 | if (ret) | 404 | ret = count; |
| 405 | count = ret; | 405 | out: |
| 406 | 406 | return ret; | |
| 407 | return count; | ||
| 408 | } | 407 | } |
| 409 | static CLASS_ATTR(probe, S_IWUSR, NULL, memory_probe_store); | 408 | static CLASS_ATTR(probe, S_IWUSR, NULL, memory_probe_store); |
| 410 | 409 | ||