Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 730abe06 authored by Viresh Kumar's avatar Viresh Kumar Committed by Eduardo Valentin
Browse files

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: default avatarJavi Merino <javi.merino@arm.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent c9ca319f

drivers/thermal/cpu_cooling.c

+12 −7
Original line number Original line Diff line number Diff line
@@ -448,8 +448,8 @@ __cpufreq_cooling_register(struct device_node *np, 




	ret = get_idr(&cpufreq_idr, &cpufreq_dev->id);

	ret = get_idr(&cpufreq_idr, &cpufreq_dev->id);

	if (ret) {

	if (ret) {

		kfree(cpufreq_dev);

		cool_dev = ERR_PTR(ret);

		return ERR_PTR(ret);

		goto free_cdev;

	}

	}





	snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",

	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,

	cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev,

						      &cpufreq_cooling_ops);

						      &cpufreq_cooling_ops);

	if (IS_ERR(cool_dev)) {

	if (IS_ERR(cool_dev))

		release_idr(&cpufreq_idr, cpufreq_dev->id);

		goto remove_idr;

		kfree(cpufreq_dev);



		return cool_dev;

	}

	cpufreq_dev->cool_dev = cool_dev;

	cpufreq_dev->cool_dev = cool_dev;





	mutex_lock(&cooling_cpufreq_lock);

	mutex_lock(&cooling_cpufreq_lock);
@@ -475,6 +473,13 @@ __cpufreq_cooling_register(struct device_node *np, 




	mutex_unlock(&cooling_cpufreq_lock);

	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;

	return cool_dev;

}

}