Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Feedback-ID: i494840e7:Fastmail
Date:   Tue, 18 Oct 2022 13:33:45 +0300
From:   Ido Schimmel <idosch@idosch.org>
To:     Daniel Lezcano <daniel.lezcano@linexp.org>
Cc:     daniel.lezcano@linaro.org, rafael@kernel.org, rui.zhang@intel.com,
        linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
        khilman@baylibre.com, abailon@baylibre.com, lukasz.luba@arm.com,
        broonie@kernel.org, damien.lemoal@opensource.wdc.com,
        heiko@sntech.de, hayashi.kunihiko@socionext.com,
        mhiramat@kernel.org, talel@amazon.com, thierry.reding@gmail.com,
        digetx@gmail.com, jonathanh@nvidia.com, anarsoul@gmail.com,
        tiny.windzz@gmail.com, baolin.wang7@gmail.com,
        f.fainelli@gmail.com, bjorn.andersson@linaro.org,
        mcoquelin.stm32@gmail.com, glaroque@baylibre.com,
        miquel.raynal@bootlin.com, shawnguo@kernel.org,
        niklas.soderlund@ragnatech.se, matthias.bgg@gmail.com,
        j-keerthy@ti.com, Amit Kucheria <amitk@kernel.org>
Subject: Re: [PATCH v5 01/33] thermal/of: Rework the thermal device tree
 initialization
Message-ID: <Y06BCSh+jq5Ztf+3@shredder>
References: <20220804224349.1926752-1-daniel.lezcano@linexp.org>
 <20220804224349.1926752-2-daniel.lezcano@linexp.org>
 <Y05/8JUU+3kLCZvb@shredder>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <Y05/8JUU+3kLCZvb@shredder>
Precedence: bulk

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);
>  }