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

Commit 53486a48 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: of-thermal: Handle krealloc failure correctly"

parents f0439230 18919f50

drivers/thermal/of-thermal.c

+2 −2
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ thermal_zone_of_add_sensor(struct device_node *zone, 
	tz_list_new = krealloc(sens_param->tz_list,

			sens_param->tz_cnt * sizeof(struct __thermal_zone *),

			GFP_KERNEL);

	if (!tz_list_new[0])

	if (!tz_list_new)

		goto add_sensor_exit;

	sens_param->tz_list = tz_list_new;

	sens_param->tz_list[sens_param->tz_cnt - 1] = tz;
@@ -961,7 +961,7 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data, 
	of_node_put(sensor_np);

	of_node_put(np);



	if (!sens_param->tz_cnt) {

	if (!sens_param->tz_cnt || !sens_param->tz_list) {

		devm_kfree(dev, sens_param);

		return ERR_PTR(-ENODEV);

	}