Skip to content

Commit 085aa2d

Browse files
ArvindYadavCsgregkh
authored andcommitted
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 <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 1350986 commit 085aa2d

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

drivers/base/memory.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,13 +649,19 @@ static const struct attribute_group *memory_memblk_attr_groups[] = {
649649
static
650650
int register_memory(struct memory_block *memory)
651651
{
652+
int ret;
653+
652654
memory->dev.bus = &memory_subsys;
653655
memory->dev.id = memory->start_section_nr / sections_per_block;
654656
memory->dev.release = memory_block_release;
655657
memory->dev.groups = memory_memblk_attr_groups;
656658
memory->dev.offline = memory->state == MEM_OFFLINE;
657659

658-
return device_register(&memory->dev);
660+
ret = device_register(&memory->dev);
661+
if (ret)
662+
put_device(&memory->dev);
663+
664+
return ret;
659665
}
660666

661667
static int init_memory_block(struct memory_block **memory,

0 commit comments

Comments
 (0)