Re: [PATCH v5 01/33] thermal/of: Rework the thermal device tree initialization

Ido Schimmel
2022-10-18T10:34:17Z

On Tue, Oct 18, 2022 at 01:29:04PM +0300, Ido Schimmel wrote:
> diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
> index d4b6335ace15..43d55c29a29a 100644
> --- a/drivers/thermal/thermal_of.c
> +++ b/drivers/thermal/thermal_of.c
> @@ -604,13 +604,15 @@ struct thermal_zone_device *thermal_of_zone_register(struct device_node *sensor,
> if (IS_ERR(np)) {
> if (PTR_ERR(np) != -ENODEV)
> pr_err("Failed to find thermal zone for %pOFn id=%d\n", sensor, id);
> - return ERR_CAST(np);
> + ret = PTR_ERR(np);
> + goto out_kfree_of_ops;
> }
>
> trips = thermal_of_trips_init(np, &ntrips);
> if (IS_ERR(trips)) {
> pr_err("Failed to find trip points for %pOFn id=%d\n", sensor, id);
> - return ERR_CAST(trips);
> + ret = PTR_ERR(np);

Sorry, should be:

ret = PTR_ERR(trips);

> + goto out_kfree_of_ops;
> }
>
> ret = thermal_of_monitor_init(np, &delay, &pdelay);
> @@ -659,6 +661,8 @@ struct thermal_zone_device *thermal_of_zone_register(struct device_node *sensor,
> kfree(tzp);
> out_kfree_trips:
> kfree(trips);
> +out_kfree_of_ops:
> + kfree(of_ops);
>
> return ERR_PTR(ret);
> }