diff options
Diffstat (limited to 'drivers/acpi/fan.c')
-rw-r--r-- | drivers/acpi/fan.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index c8e3cba423ef..4d535c50d821 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c | |||
@@ -260,24 +260,22 @@ static int acpi_fan_add(struct acpi_device *device) | |||
260 | result = PTR_ERR(cdev); | 260 | result = PTR_ERR(cdev); |
261 | goto end; | 261 | goto end; |
262 | } | 262 | } |
263 | if (cdev) { | 263 | printk(KERN_INFO PREFIX |
264 | printk(KERN_INFO PREFIX | 264 | "%s is registered as cooling_device%d\n", |
265 | "%s is registered as cooling_device%d\n", | 265 | device->dev.bus_id, cdev->id); |
266 | device->dev.bus_id, cdev->id); | 266 | |
267 | 267 | acpi_driver_data(device) = cdev; | |
268 | acpi_driver_data(device) = cdev; | 268 | result = sysfs_create_link(&device->dev.kobj, |
269 | result = sysfs_create_link(&device->dev.kobj, | 269 | &cdev->device.kobj, |
270 | &cdev->device.kobj, | 270 | "thermal_cooling"); |
271 | "thermal_cooling"); | 271 | if (result) |
272 | if (result) | 272 | return result; |
273 | return result; | 273 | |
274 | 274 | result = sysfs_create_link(&cdev->device.kobj, | |
275 | result = sysfs_create_link(&cdev->device.kobj, | 275 | &device->dev.kobj, |
276 | &device->dev.kobj, | 276 | "device"); |
277 | "device"); | 277 | if (result) |
278 | if (result) | 278 | return result; |
279 | return result; | ||
280 | } | ||
281 | 279 | ||
282 | result = acpi_fan_add_fs(device); | 280 | result = acpi_fan_add_fs(device); |
283 | if (result) | 281 | if (result) |