From ae48841d02fe9799813ff8e577d05df24ae23227 Mon Sep 17 00:00:00 2001
From: Alex Chiang <achiang@hp.com>
Date: Mon, 14 Dec 2009 17:59:07 -0800
Subject: [PATCH] --- yaml --- r: 176278 b: refs/heads/master c:
 b9d52dad9447d0db4b52d67d5e9e9d339b5e8302 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/base/node.c | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 0affb140c60f..88c7c3ab759f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8246f3159dfdf97b8b40f9e03e715bafedd22fc
+refs/heads/master: b9d52dad9447d0db4b52d67d5e9e9d339b5e8302
diff --git a/trunk/drivers/base/node.c b/trunk/drivers/base/node.c
index eeae035dadc3..9b9acc39a1eb 100644
--- a/trunk/drivers/base/node.c
+++ b/trunk/drivers/base/node.c
@@ -287,12 +287,18 @@ int register_cpu_under_node(unsigned int cpu, unsigned int nid)
 
 int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)
 {
-	if (node_online(nid)) {
-		struct sys_device *obj = get_cpu_sysdev(cpu);
-		if (obj)
-			sysfs_remove_link(&node_devices[nid].sysdev.kobj,
-					 kobject_name(&obj->kobj));
-	}
+	struct sys_device *obj;
+
+	if (!node_online(nid))
+		return 0;
+
+	obj = get_cpu_sysdev(cpu);
+	if (!obj)
+		return 0;
+
+	sysfs_remove_link(&node_devices[nid].sysdev.kobj,
+			  kobject_name(&obj->kobj));
+
 	return 0;
 }