From: Wei Yongjun yongjun_wei@trendmicro.com.cn
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 (cherry picked from commit 73b9bcd76d13716cc0e0ab053f8c1ae41f47636e) Signed-off-by: Alex Shi alex.shi@linaro.org
Conflicts: drivers/thermal/cpu_cooling.c --- drivers/thermal/cpu_cooling.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index dc50315..8c15474 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -482,7 +482,7 @@ __cpufreq_cooling_register(struct device_node *np, 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;