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

Commit 9751a9e4 authored by Javi Merino's avatar Javi Merino Committed by Linus Torvalds
Browse files

thermal: power_allocator: allocate with kcalloc what you free with kfree 



Commit cf736ea6 ("thermal: power_allocator: do not use devm*
interfaces") forgot to change a devm_kcalloc() to just kcalloc(), but
it's corresponding devm_kfree() was changed to kfree().  Allocate with
kcalloc() to match the kfree().

Fixes: cf736ea6 ("thermal: power_allocator: do not use devm* interfaces")
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarJavi Merino <javi.merino@arm.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5e7fec29

drivers/thermal/power_allocator.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -258,8 +258,7 @@ static int allocate_power(struct thermal_zone_device *tz, 
	BUILD_BUG_ON(sizeof(*req_power) != sizeof(*granted_power));

	BUILD_BUG_ON(sizeof(*req_power) != sizeof(*granted_power));

	BUILD_BUG_ON(sizeof(*req_power) != sizeof(*extra_actor_power));

	BUILD_BUG_ON(sizeof(*req_power) != sizeof(*extra_actor_power));

	BUILD_BUG_ON(sizeof(*req_power) != sizeof(*weighted_req_power));

	BUILD_BUG_ON(sizeof(*req_power) != sizeof(*weighted_req_power));

	req_power = devm_kcalloc(&tz->device, num_actors * 5,

	req_power = kcalloc(num_actors * 5, sizeof(*req_power), GFP_KERNEL);

				 sizeof(*req_power), GFP_KERNEL);

	if (!req_power) {

	if (!req_power) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto unlock;

		goto unlock;