Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/misc/intel_menlow.c b/drivers/misc/intel_menlow.c
index f70984ab1e1b..de16e88eb8d3 100644
--- a/drivers/misc/intel_menlow.c
+++ b/drivers/misc/intel_menlow.c
@@ -170,10 +170,13 @@ static int intel_menlow_memory_add(struct acpi_device *device)
 
         cdev = thermal_cooling_device_register("Memory controller", device,
                                                &memory_cooling_ops);
-        acpi_driver_data(device) = cdev;
-        if (!cdev)
-                result = -ENODEV;
-        else {
+        if (IS_ERR(cdev)) {
+                result = PTR_ERR(cdev);
+                goto end;
+        }
+
+        if (cdev) {
+                acpi_driver_data(device) = cdev;
                 result = sysfs_create_link(&device->dev.kobj,
                                         &cdev->device.kobj, "thermal_cooling");
                 if (result)