浏览代码

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>
Arvind Yadav 7 年之前
父节点
当前提交
085aa2de56
共有 1 个文件被更改,包括 7 次插入1 次删除
  1. 7 1
      drivers/base/memory.c

+ 7 - 1
drivers/base/memory.c

@@ -649,13 +649,19 @@ static const struct attribute_group *memory_memblk_attr_groups[] = {
 static
 static
 int register_memory(struct memory_block *memory)
 int register_memory(struct memory_block *memory)
 {
 {
+	int ret;
+
 	memory->dev.bus = &memory_subsys;
 	memory->dev.bus = &memory_subsys;
 	memory->dev.id = memory->start_section_nr / sections_per_block;
 	memory->dev.id = memory->start_section_nr / sections_per_block;
 	memory->dev.release = memory_block_release;
 	memory->dev.release = memory_block_release;
 	memory->dev.groups = memory_memblk_attr_groups;
 	memory->dev.groups = memory_memblk_attr_groups;
 	memory->dev.offline = memory->state == MEM_OFFLINE;
 	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,
 static int init_memory_block(struct memory_block **memory,