From 2963530c35bfa86e74509a8c4b414b6e02e86c60 Mon Sep 17 00:00:00 2001
From: Alex Chiang <achiang@hp.com>
Date: Mon, 14 Dec 2009 17:59:06 -0800
Subject: [PATCH] --- yaml --- r: 176277 b: refs/heads/master c:
 f8246f3159dfdf97b8b40f9e03e715bafedd22fc h: refs/heads/master i:   176275:
 5431284ff47d3e9a462f7f06c1c632f004ce2a4b v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/base/node.c | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 6db274049e57..0affb140c60f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dee5d0d518defd0337a41f1a504428c9acc87be5
+refs/heads/master: f8246f3159dfdf97b8b40f9e03e715bafedd22fc
diff --git a/trunk/drivers/base/node.c b/trunk/drivers/base/node.c
index 44eed11bbdf3..eeae035dadc3 100644
--- a/trunk/drivers/base/node.c
+++ b/trunk/drivers/base/node.c
@@ -271,16 +271,18 @@ struct node node_devices[MAX_NUMNODES];
  */
 int register_cpu_under_node(unsigned int cpu, unsigned int nid)
 {
-	if (node_online(nid)) {
-		struct sys_device *obj = get_cpu_sysdev(cpu);
-		if (!obj)
-			return 0;
-		return sysfs_create_link(&node_devices[nid].sysdev.kobj,
-					 &obj->kobj,
-					 kobject_name(&obj->kobj));
-	 }
+	struct sys_device *obj;
 
-	return 0;
+	if (!node_online(nid))
+		return 0;
+
+	obj = get_cpu_sysdev(cpu);
+	if (!obj)
+		return 0;
+
+	return sysfs_create_link(&node_devices[nid].sysdev.kobj,
+				&obj->kobj,
+				kobject_name(&obj->kobj));
 }
 
 int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)