From 26b67615874c4e58ecd987ab0e65acb0b34267f2 Mon Sep 17 00:00:00 2001
From: Thomas Sujith <sujith.thomas@intel.com>
Date: Fri, 15 Feb 2008 18:26:54 -0500
Subject: [PATCH] --- yaml --- r: 86115 b: refs/heads/master c:
 d76628c67cdeebf84766a19c67c821c2e518baa4 h: refs/heads/master i:   86113:
 04f26f910d02241416275ab16a1d4b1c15a63f3c   86111:
 2cde2cf44be7fd5e978f854691c37ebc2001c65e v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/acpi/processor_core.c | 37 +++++++++++++++++------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index f12b9d2a124c..adede5d930f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19b36780ee7ddeb5080e3f1f858a83c4824f1fdc
+refs/heads/master: d76628c67cdeebf84766a19c67c821c2e518baa4
diff --git a/trunk/drivers/acpi/processor_core.c b/trunk/drivers/acpi/processor_core.c
index 75ccf5d18bf4..b02006951cd0 100644
--- a/trunk/drivers/acpi/processor_core.c
+++ b/trunk/drivers/acpi/processor_core.c
@@ -670,21 +670,26 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
 
 	pr->cdev = thermal_cooling_device_register("Processor", device,
 						&processor_cooling_ops);
-	if (pr->cdev)
+	if (IS_ERR(pr->cdev)) {
+		result = PTR_ERR(pr->cdev);
+		goto end;
+	}
+	if (pr->cdev) {
 		printk(KERN_INFO PREFIX
 			"%s is registered as cooling_device%d\n",
 			device->dev.bus_id, pr->cdev->id);
-	else
-		goto end;
 
-	result = sysfs_create_link(&device->dev.kobj, &pr->cdev->device.kobj,
-					"thermal_cooling");
-	if (result)
-		return result;
-	result = sysfs_create_link(&pr->cdev->device.kobj, &device->dev.kobj,
-					"device");
-	if (result)
-		return result;
+		result = sysfs_create_link(&device->dev.kobj,
+					   &pr->cdev->device.kobj,
+					   "thermal_cooling");
+		if (result)
+			return result;
+		result = sysfs_create_link(&pr->cdev->device.kobj,
+					   &device->dev.kobj,
+					   "device");
+		if (result)
+			return result;
+	}
 
 	if (pr->flags.throttling) {
 		printk(KERN_INFO PREFIX "%s [%s] (supports",
@@ -809,10 +814,12 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
 
 	acpi_processor_remove_fs(device);
 
-	sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
-	sysfs_remove_link(&pr->cdev->device.kobj, "device");
-	thermal_cooling_device_unregister(pr->cdev);
-	pr->cdev = NULL;
+	if (pr->cdev) {
+		sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
+		sysfs_remove_link(&pr->cdev->device.kobj, "device");
+		thermal_cooling_device_unregister(pr->cdev);
+		pr->cdev = NULL;
+	}
 
 	processors[pr->id] = NULL;