2019-08-06 06:56:55

by Anson Huang

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

From: Anson Huang <[email protected]>

When of_clk_add_provider failed, all clks should be unregistered.

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

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[] = {
--
2.7.4

2019-08-06 06:57:27

by Anson Huang

Subject: [PATCH 2/2] clk: imx8mq: Unregister clks when of_clk_add_provider failed

From: Anson Huang <[email protected]>

When of_clk_add_provider failed, all clks should be unregistered.

Signed-off-by: Anson Huang <[email protected]>
---
drivers/clk/imx/clk-imx8mq.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/imx/clk-imx8mq.c b/drivers/clk/imx/clk-imx8mq.c
index 04302f2..81a0249 100644
--- a/drivers/clk/imx/clk-imx8mq.c
+++ b/drivers/clk/imx/clk-imx8mq.c
@@ -562,10 +562,18 @@ static int imx8mq_clocks_probe(struct platform_device *pdev)
clk_data.clk_num = ARRAY_SIZE(clks);

err = of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
- WARN_ON(err);
+ if (err < 0) {
+ dev_err(dev, "failed to register clks for i.MX8MQ\n");
+ goto unregister_clks;
+ }

imx_register_uart_clocks(uart_clks);

+ return 0;
+
+unregister_clks:
+ imx_unregister_clocks(clks, ARRAY_SIZE(clks));
+
return err;
}

--
2.7.4

2019-08-06 09:10:49

by Daniel Baluta

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

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


Reviewed-by: Daniel Baluta <[email protected]>

Thanks Anson for the patch!

2019-08-06 09:19:21

by Daniel Baluta

Subject: Re: [PATCH 2/2] clk: imx8mq: Unregister clks when of_clk_add_provider failed

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

Reviewed-by: Daniel Baluta <[email protected]>

> ---
> drivers/clk/imx/clk-imx8mq.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clk/imx/clk-imx8mq.c b/drivers/clk/imx/clk-
> imx8mq.c
> index 04302f2..81a0249 100644
> --- a/drivers/clk/imx/clk-imx8mq.c
> +++ b/drivers/clk/imx/clk-imx8mq.c
> @@ -562,10 +562,18 @@ static int imx8mq_clocks_probe(struct
> platform_device *pdev)
> clk_data.clk_num = ARRAY_SIZE(clks);
>
> err = of_clk_add_provider(np, of_clk_src_onecell_get,
> &clk_data);
> - WARN_ON(err);
> + if (err < 0) {
> + dev_err(dev, "failed to register clks for i.MX8MQ\n");
> + goto unregister_clks;
> + }
>
> imx_register_uart_clocks(uart_clks);
>
> + return 0;
> +
> +unregister_clks:
> + imx_unregister_clocks(clks, ARRAY_SIZE(clks));
> +
> return err;
> }
>

2019-08-12 14:17:19

by Shawn Guo

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

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

Applied both, thanks.