Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[cascardo/linux.git] / drivers / base / cpu.c

diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 691eeea..4c28e1a 100644 (file)
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -371,12 +371,13 @@ int register_cpu(struct cpu *cpu, int num)
        if (cpu->hotpluggable)
                cpu->dev.groups = hotplugable_cpu_attr_groups;
        error = device_register(&cpu->dev);
-       if (!error)
-               per_cpu(cpu_sys_devices, num) = &cpu->dev;
-       if (!error)
-               register_cpu_under_node(num, cpu_to_node(num));
+       if (error)
+               return error;
 
-       return error;
+       per_cpu(cpu_sys_devices, num) = &cpu->dev;
+       register_cpu_under_node(num, cpu_to_node(num));
+
+       return 0;
 }
 
 struct device *get_cpu_device(unsigned cpu)