diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-10-25 21:55:42 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-11-06 13:16:49 +0800 |
| commit | 73b9bcd76d13716cc0e0ab053f8c1ae41f47636e (patch) | |
| tree | f35e989f059b5846d845045f9945bcf9d01a992c | |
| parent | 732e4c8db99cb3125bd6865794ec8e3a998c4d6e (diff) | |
| download | talos-op-linux-73b9bcd76d13716cc0e0ab053f8c1ae41f47636e.tar.gz talos-op-linux-73b9bcd76d13716cc0e0ab053f8c1ae41f47636e.zip | |
thermal: cpu_cooling: fix return value check in cpufreq_cooling_register()
In case of error, the function thermal_cooling_device_register() returns
ERR_PTR() and never returns NULL. The NULL test in the return value check
should be replaced with IS_ERR().
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
| -rw-r--r-- | drivers/thermal/cpu_cooling.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index d17902886c3f..02a46f23d14c 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -469,10 +469,10 @@ cpufreq_cooling_register(const struct cpumask *clip_cpus) cool_dev = thermal_cooling_device_register(dev_name, cpufreq_dev, &cpufreq_cooling_ops); - if (!cool_dev) { + if (IS_ERR(cool_dev)) { release_idr(&cpufreq_idr, cpufreq_dev->id); kfree(cpufreq_dev); - return ERR_PTR(-EINVAL); + return cool_dev; } cpufreq_dev->cool_dev = cool_dev; cpufreq_dev->cpufreq_state = 0; |
