diff options
| author | Thomas Sujith <sujith.thomas@intel.com> | 2008-02-15 07:01:52 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-16 00:21:30 +0100 |
| commit | 19b36780ee7ddeb5080e3f1f858a83c4824f1fdc (patch) | |
| tree | 88e854c9573fd61b0a78e01e1dd257cee4ce2c08 /drivers/acpi/fan.c | |
| parent | thermal: use ERR_PTR for returning error (diff) | |
| download | linux-19b36780ee7ddeb5080e3f1f858a83c4824f1fdc.tar.xz linux-19b36780ee7ddeb5080e3f1f858a83c4824f1fdc.zip | |
ACPI fan: extract return values using PTR_ERR
Need to extract errors using PTR_ERR macro and
process accordingly. thermal_cooling_device_register
returning NULL means that CONFIG_THERMAL=n and in that
case no need to create symbolic links.
Signed-off-by: Thomas Sujith <sujith.thomas@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/fan.c')
| -rw-r--r-- | drivers/acpi/fan.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index 48cb705b274a..c8e3cba423ef 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c @@ -256,22 +256,28 @@ static int acpi_fan_add(struct acpi_device *device) cdev = thermal_cooling_device_register("Fan", device, &fan_cooling_ops); - if (cdev) + if (IS_ERR(cdev)) { + result = PTR_ERR(cdev); + goto end; + } + if (cdev) { printk(KERN_INFO PREFIX "%s is registered as cooling_device%d\n", device->dev.bus_id, cdev->id); - else - goto end; - 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; + 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) |