History

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

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().

Javi Merino committed 11 years ago

Commit 9751a9e1 parent 5e7fec21 file · +1 −2Browse files

Unified · Split

drivers/thermal/power_allocator.c+1−2
@@ -258,8 +258,7 @@ static int allocate_power(struct thermal_zone_device *tz, · 257 unmodified lines
258 BUILD_BUG_ON(sizeof(*req_power) != sizeof(*granted_power));258 BUILD_BUG_ON(sizeof(*req_power) != sizeof(*granted_power));
259 BUILD_BUG_ON(sizeof(*req_power) != sizeof(*extra_actor_power));259 BUILD_BUG_ON(sizeof(*req_power) != sizeof(*extra_actor_power));
260 BUILD_BUG_ON(sizeof(*req_power) != sizeof(*weighted_req_power));260 BUILD_BUG_ON(sizeof(*req_power) != sizeof(*weighted_req_power));
261 req_power = devm_kcalloc(&tz->device, num_actors * 5,261 req_power = kcalloc(num_actors * 5, sizeof(*req_power), GFP_KERNEL);
262 sizeof(*req_power), GFP_KERNEL);
263 if (!req_power) {262 if (!req_power) {
264 ret = -ENOMEM;263 ret = -ENOMEM;
265 goto unlock;264 goto unlock;