| Message ID | 20190806064614.20294-2-Anson.Huang@nxp.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | e8760d8a698c3d61d6267f32acc2b845ac1de15e |
| Headers | show |
| Series | [1/2] clk: imx8mm: Unregister clks when of_clk_add_provider failed | expand |
On Tue, 2019-08-06 at 14:46 +0800, Anson.Huang@nxp.com wrote: > From: Anson Huang <Anson.Huang@nxp.com> > > When of_clk_add_provider failed, all clks should be unregistered. > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com> > --- > 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; > } >
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; }