diff mbox series

clk: scmi: Free scmi_clk allocated when the clocks with invalid info are skipped

Message ID 20231004193600.66232-1-sudeep.holla@arm.com (mailing list archive)
State Awaiting Upstream, archived
Headers show
Series clk: scmi: Free scmi_clk allocated when the clocks with invalid info are skipped | expand

Commit Message

Sudeep Holla Oct. 4, 2023, 7:36 p.m. UTC
Add the missing devm_kfree() when we skip the clocks with invalid or
missing information from the firmware.

Cc: Cristian Marussi <cristian.marussi@arm.com>
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: linux-clk@vger.kernel.org
Fixes: 6d6a1d82eaef ("clk: add support for clocks provided by SCMI")
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 drivers/clk/clk-scmi.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Cristian Marussi Oct. 5, 2023, 10:19 a.m. UTC | #1
On Wed, Oct 04, 2023 at 08:36:00PM +0100, Sudeep Holla wrote:
> Add the missing devm_kfree() when we skip the clocks with invalid or
> missing information from the firmware.
> 

Hi,

LGTM.

Reviewed-by: Cristian Marussi <cristian.marussi@arm.com>

Thanks,
Cristian

> Cc: Cristian Marussi <cristian.marussi@arm.com>
> Cc: Michael Turquette <mturquette@baylibre.com>
> Cc: Stephen Boyd <sboyd@kernel.org>
> Cc: linux-clk@vger.kernel.org
> Fixes: 6d6a1d82eaef ("clk: add support for clocks provided by SCMI")
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>  drivers/clk/clk-scmi.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c
> index 2e1337b511eb..3f525bed9794 100644
> --- a/drivers/clk/clk-scmi.c
> +++ b/drivers/clk/clk-scmi.c
> @@ -232,6 +232,7 @@ static int scmi_clocks_probe(struct scmi_device *sdev)
>  		sclk->info = scmi_proto_clk_ops->info_get(ph, idx);
>  		if (!sclk->info) {
>  			dev_dbg(dev, "invalid clock info for idx %d\n", idx);
> +			devm_kfree(dev, sclk);
>  			continue;
>  		}
>  
> -- 
> 2.42.0
>
Sudeep Holla Oct. 9, 2023, 11:14 a.m. UTC | #2
On Wed, 04 Oct 2023 20:36:00 +0100, Sudeep Holla wrote:
> Add the missing devm_kfree() when we skip the clocks with invalid or
> missing information from the firmware.
>

Hi Stephen,

Since you have acked other changes in the same driver and agreed to take it
via SoC tree, I have applied this simple fix.

Applied to sudeep.holla/linux (for-next/scmi/updates), thanks!

[1/1] clk: scmi: Free scmi_clk allocated when the clocks with invalid info are skipped
      https://git.kernel.org/sudeep.holla/c/3537a75e73f3
--
Regards,
Sudeep
Stephen Boyd Oct. 19, 2023, 12:54 a.m. UTC | #3
Quoting Sudeep Holla (2023-10-04 12:36:00)
> Add the missing devm_kfree() when we skip the clocks with invalid or
> missing information from the firmware.
> 
> Cc: Cristian Marussi <cristian.marussi@arm.com>
> Cc: Michael Turquette <mturquette@baylibre.com>
> Cc: Stephen Boyd <sboyd@kernel.org>
> Cc: linux-clk@vger.kernel.org
> Fixes: 6d6a1d82eaef ("clk: add support for clocks provided by SCMI")
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---

Acked-by: Stephen Boyd <sboyd@kernel.org>
diff mbox series

Patch

diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c
index 2e1337b511eb..3f525bed9794 100644
--- a/drivers/clk/clk-scmi.c
+++ b/drivers/clk/clk-scmi.c
@@ -232,6 +232,7 @@  static int scmi_clocks_probe(struct scmi_device *sdev)
 		sclk->info = scmi_proto_clk_ops->info_get(ph, idx);
 		if (!sclk->info) {
 			dev_dbg(dev, "invalid clock info for idx %d\n", idx);
+			devm_kfree(dev, sclk);
 			continue;
 		}