ibm_newemac Use status property for unused/unwired EMACs

[linux-2.6] / drivers / acpi / fan.c

diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 4d535c50d821e2a44d9fe3e9881b1d2d24213c02..c8e3cba423ef19d7548b63bfdb041d266454d4e1 100644 (file)
--- 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)