]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
thermal: power_allocator: allocate with kcalloc what you free with kfree
authorJavi Merino <javi.merino@arm.com>
Tue, 25 Aug 2015 18:22:35 +0000 (19:22 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Aug 2015 17:10:47 +0000 (10:10 -0700)
Commit cf736ea6f902 ("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: cf736ea6f902 ("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: Javi Merino <javi.merino@arm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/thermal/power_allocator.c

index 7006860f2f3693b04ee44996c5085e2f94ceae44..251676902869d673140b3684c64b0c63ea376f77 100644 (file)
@@ -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(*extra_actor_power));
        BUILD_BUG_ON(sizeof(*req_power) != sizeof(*weighted_req_power));
-       req_power = devm_kcalloc(&tz->device, num_actors * 5,
-                                sizeof(*req_power), GFP_KERNEL);
+       req_power = kcalloc(num_actors * 5, sizeof(*req_power), GFP_KERNEL);
        if (!req_power) {
                ret = -ENOMEM;
                goto unlock;