3 files changed, 49 insertions, 43 deletions

diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 4d535c50d821..c8e3cba423ef 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -260,22 +260,24 @@ static int acpi_fan_add(struct acpi_device *device)
                 result = PTR_ERR(cdev);
                 goto end;
         }
-        printk(KERN_INFO PREFIX
-                "%s is registered as cooling_device%d\n",
-                device->dev.bus_id, cdev->id);
-
-        acpi_driver_data(device) = cdev;
-        result = sysfs_create_link(&device->dev.kobj,
-                                   &cdev->device.kobj,
-                                   "thermal_cooling");
-        if (result)
-                return result;
-
-        result = sysfs_create_link(&cdev->device.kobj,
-                                   &device->dev.kobj,
-                                   "device");
-        if (result)
-                return result;
+        if (cdev) {
+                printk(KERN_INFO PREFIX
+                        "%s is registered as cooling_device%d\n",
+                        device->dev.bus_id, cdev->id);
+
+                acpi_driver_data(device) = cdev;
+                result = sysfs_create_link(&device->dev.kobj,
+                                           &cdev->device.kobj,
+                                           "thermal_cooling");
+                if (result)
+                        return result;
+
+                result = sysfs_create_link(&cdev->device.kobj,
+                                           &device->dev.kobj,
+                                           "device");
+                if (result)
+                        return result;
+        }
 
         result = acpi_fan_add_fs(device);
         if (result)
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 3a136f6c66a3..36a68fa114e3 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -674,20 +674,22 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
                 result = PTR_ERR(pr->cdev);
                 goto end;
         }
-        printk(KERN_INFO PREFIX
-                "%s is registered as cooling_device%d\n",
-                device->dev.bus_id, pr->cdev->id);
-
-        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->cdev) {
+                printk(KERN_INFO PREFIX
+                        "%s is registered as cooling_device%d\n",
+                        device->dev.bus_id, pr->cdev->id);
+
+                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",
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index fe09b57de617..12fb44f16766 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -734,19 +734,21 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                 if (IS_ERR(device->cdev))
                         return;
 
-                printk(KERN_INFO PREFIX
-                        "%s is registered as cooling_device%d\n",
-                        device->dev->dev.bus_id, device->cdev->id);
-                result = sysfs_create_link(&device->dev->dev.kobj,
-                                  &device->cdev->device.kobj,
-                                  "thermal_cooling");
-                if (result)
-                        printk(KERN_ERR PREFIX "Create sysfs link\n");
-                result = sysfs_create_link(&device->cdev->device.kobj,
-                                  &device->dev->dev.kobj,
-                                  "device");
-                if (result)
-                        printk(KERN_ERR PREFIX "Create sysfs link\n");
+                if (device->cdev) {
+                        printk(KERN_INFO PREFIX
+                                "%s is registered as cooling_device%d\n",
+                                device->dev->dev.bus_id, device->cdev->id);
+                        result = sysfs_create_link(&device->dev->dev.kobj,
+                                          &device->cdev->device.kobj,
+                                          "thermal_cooling");
+                        if (result)
+                                printk(KERN_ERR PREFIX "Create sysfs link\n");
+                        result = sysfs_create_link(&device->cdev->device.kobj,
+                                          &device->dev->dev.kobj,
+                                          "device");
+                        if (result)
+                                printk(KERN_ERR PREFIX "Create sysfs link\n");
+                }
         }
         if (device->cap._DCS && device->cap._DSS){
                 static int count = 0;