diff options
Diffstat (limited to 'drivers/acpi/fan.c')
-rw-r--r-- | drivers/acpi/fan.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index 194077ab9b85..6cf10cbc1eee 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c | |||
@@ -256,24 +256,23 @@ static int acpi_fan_add(struct acpi_device *device) | |||
256 | result = PTR_ERR(cdev); | 256 | result = PTR_ERR(cdev); |
257 | goto end; | 257 | goto end; |
258 | } | 258 | } |
259 | if (cdev) { | 259 | |
260 | printk(KERN_INFO PREFIX | 260 | printk(KERN_INFO PREFIX |
261 | "%s is registered as cooling_device%d\n", | 261 | "%s is registered as cooling_device%d\n", |
262 | device->dev.bus_id, cdev->id); | 262 | device->dev.bus_id, cdev->id); |
263 | 263 | ||
264 | acpi_driver_data(device) = cdev; | 264 | acpi_driver_data(device) = cdev; |
265 | result = sysfs_create_link(&device->dev.kobj, | 265 | result = sysfs_create_link(&device->dev.kobj, |
266 | &cdev->device.kobj, | 266 | &cdev->device.kobj, |
267 | "thermal_cooling"); | 267 | "thermal_cooling"); |
268 | if (result) | 268 | if (result) |
269 | return result; | 269 | printk(KERN_ERR PREFIX "Create sysfs link\n"); |
270 | 270 | ||
271 | result = sysfs_create_link(&cdev->device.kobj, | 271 | result = sysfs_create_link(&cdev->device.kobj, |
272 | &device->dev.kobj, | 272 | &device->dev.kobj, |
273 | "device"); | 273 | "device"); |
274 | if (result) | 274 | if (result) |
275 | return result; | 275 | printk(KERN_ERR PREFIX "Create sysfs link\n"); |
276 | } | ||
277 | 276 | ||
278 | result = acpi_fan_add_fs(device); | 277 | result = acpi_fan_add_fs(device); |
279 | if (result) | 278 | if (result) |