[1/2] clk: imx8mm: Unregister clks when of_clk_add_provider failed

Commit Message

Anson Huang Aug. 6, 2019, 6:46 a.m. UTC

From: Anson Huang <[e-mail]>

When of_clk_add_provider failed, all clks should be unregistered.

Signed-off-by: Anson Huang <[e-mail]>
---
 drivers/clk/imx/clk-imx8mm.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Daniel Baluta Aug. 6, 2019, 9:09 a.m. UTC | #1

On Tue, 2019-08-06 at 14:46 +0800, [e-mail] wrote:
> From: Anson Huang <[e-mail]>
> 
> When of_clk_add_provider failed, all clks should be unregistered.
> 
> Signed-off-by: Anson Huang <[e-mail]>


Reviewed-by: Daniel Baluta <[e-mail]>

Thanks Anson for the patch!

Shawn Guo Aug. 12, 2019, 2:16 p.m. UTC | #2

On Tue, Aug 06, 2019 at 02:46:13PM +0800, [e-mail] wrote:
> From: Anson Huang <[e-mail]>
> 
> When of_clk_add_provider failed, all clks should be unregistered.
> 
> Signed-off-by: Anson Huang <[e-mail]>

Applied both, thanks.

Patch

diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c
index e494e99..49ad761 100644
--- a/drivers/clk/imx/clk-imx8mm.c
+++ b/drivers/clk/imx/clk-imx8mm.c
@@ -661,12 +661,17 @@  static int imx8mm_clocks_probe(struct platform_device *pdev)
 	ret = of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
 	if (ret < 0) {
 		pr_err("failed to register clks for i.MX8MM\n");
-		return -EINVAL;
+		goto unregister_clks;
 	}
 
 	imx_register_uart_clocks(uart_clks);
 
 	return 0;
+
+unregister_clks:
+	imx_unregister_clocks(clks, ARRAY_SIZE(clks));
+
+	return ret;
 }
 
 static const struct of_device_id imx8mm_clk_of_match[] = {