mm: memory_hotplug: use put_device() if device_register fail

if device_register() returned an error. Always use put_device()
to give up the initialized reference and release allocated memory.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index bffe8616bd55437e728404a90305b95f1a503dfc..f5e560188a18933bc58dcd923d59381bd856d12f 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -649,13 +649,19 @@ static const struct attribute_group *memory_memblk_attr_groups[] = {
 static
 int register_memory(struct memory_block *memory)
 {
+       int ret;
+
        memory->dev.bus = &memory_subsys;
        memory->dev.id = memory->start_section_nr / sections_per_block;
        memory->dev.release = memory_block_release;
        memory->dev.groups = memory_memblk_attr_groups;
        memory->dev.offline = memory->state == MEM_OFFLINE;
 
-       return device_register(&memory->dev);
+       ret = device_register(&memory->dev);
+       if (ret)
+               put_device(&memory->dev);
+
+       return ret;
 }
 
 static int init_memory_block(struct memory_block **memory,