diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-27 11:07:10 -0800 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-27 11:07:10 -0800 |
| commit | 9ef64cb4320df821638b508f79aa8b858cca99f0 (patch) | |
| tree | 4efbf0854234f89c6f4413077ec795fc669b5b0a /drivers/misc/intel_menlow.c | |
| parent | 6f157c1d268d5888ca44c589dccd01729c4172f6 (diff) | |
| parent | 7704a8b6fc4a8f51599eb2af4dcf1e2ac9c7e576 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/misc/intel_menlow.c')
| -rw-r--r-- | drivers/misc/intel_menlow.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/misc/intel_menlow.c b/drivers/misc/intel_menlow.c index f70984ab1e1..de16e88eb8d 100644 --- a/drivers/misc/intel_menlow.c +++ b/drivers/misc/intel_menlow.c @@ -170,10 +170,13 @@ static int intel_menlow_memory_add(struct acpi_device *device) cdev = thermal_cooling_device_register("Memory controller", device, &memory_cooling_ops); - acpi_driver_data(device) = cdev; - if (!cdev) - result = -ENODEV; - else { + if (IS_ERR(cdev)) { + result = PTR_ERR(cdev); + goto end; + } + + if (cdev) { + acpi_driver_data(device) = cdev; result = sysfs_create_link(&device->dev.kobj, &cdev->device.kobj, "thermal_cooling"); if (result) |