[PATCH 2/2] clk: versatile: clk-icst: Use common error handling code in icst_clk_setup()

Markus Elfring Markus.Elfring at web.de
Wed Jan 17 09:42:57 PST 2024


From: Markus Elfring <elfring at users.sourceforge.net>
Date: Wed, 17 Jan 2024 18:18:25 +0100

Add a jump target so that a bit of exception handling can be better reused
in an if branch of this function.

Signed-off-by: Markus Elfring <elfring at users.sourceforge.net>
---
 drivers/clk/versatile/clk-icst.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/versatile/clk-icst.c b/drivers/clk/versatile/clk-icst.c
index c4cf50a48972..9957dc9b8941 100644
--- a/drivers/clk/versatile/clk-icst.c
+++ b/drivers/clk/versatile/clk-icst.c
@@ -351,8 +351,8 @@ struct clk *icst_clk_setup(struct device *dev,

 	pclone = kmemdup(desc->params, sizeof(*pclone), GFP_KERNEL);
 	if (!pclone) {
-		kfree(icst);
-		return ERR_PTR(-ENOMEM);
+		clk = ERR_PTR(-ENOMEM);
+		goto free_icst;
 	}

 	init.name = name;
@@ -370,6 +370,7 @@ struct clk *icst_clk_setup(struct device *dev,
 	clk = clk_register(dev, &icst->hw);
 	if (IS_ERR(clk)) {
 		kfree(pclone);
+free_icst:
 		kfree(icst);
 	}

--
2.43.0




More information about the linux-arm-kernel mailing list