mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-07 03:18:31 +00:00
thermal: cpu_cooling: do error handling at the bottom in __cpufreq_cooling_register()
This makes life easy and bug free. And is scalable for future resource allocations. Acked-by: Javi Merino <javi.merino@arm.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
parent
c9ca319f05
commit
730abe064b
1 changed files with 12 additions and 7 deletions
|
@ -448,8 +448,8 @@ __cpufreq_cooling_register(struct device_node *np,
|
|||
|
||||
ret = get_idr(&cpufreq_idr, &cpufreq_dev->id);
|
||||
if (ret) {
|
||||
kfree(cpufreq_dev);
|
||||
return ERR_PTR(ret);
|
||||
cool_dev = ERR_PTR(ret);
|
||||
goto free_cdev;
|
||||
}
|
||||
|
||||
snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",
|
||||
|
@ -457,11 +457,9 @@ __cpufreq_cooling_register(struct device_node *np,
|
|||
|
||||
cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev,
|
||||
&cpufreq_cooling_ops);
|
||||
if (IS_ERR(cool_dev)) {
|
||||
release_idr(&cpufreq_idr, cpufreq_dev->id);
|
||||
kfree(cpufreq_dev);
|
||||
return cool_dev;
|
||||
}
|
||||
if (IS_ERR(cool_dev))
|
||||
goto remove_idr;
|
||||
|
||||
cpufreq_dev->cool_dev = cool_dev;
|
||||
|
||||
mutex_lock(&cooling_cpufreq_lock);
|
||||
|
@ -475,6 +473,13 @@ __cpufreq_cooling_register(struct device_node *np,
|
|||
|
||||
mutex_unlock(&cooling_cpufreq_lock);
|
||||
|
||||
return cool_dev;
|
||||
|
||||
remove_idr:
|
||||
release_idr(&cpufreq_idr, cpufreq_dev->id);
|
||||
free_cdev:
|
||||
kfree(cpufreq_dev);
|
||||
|
||||
return cool_dev;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue