From: Arvind Yadav Date: Thu, 26 Apr 2018 15:42:09 +0000 (+0530) Subject: mm: memory_hotplug: use put_device() if device_register fail X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=085aa2de568493d7cde52126512d37260077811a;p=linux.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/base/memory.c b/drivers/base/memory.c index bffe8616bd554..f5e560188a189 100644 --- 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,