| Message ID | 28d04b260acff7eb4416a410d5678cbafb5e2784.1661240416.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] media: sunxi: Fix some error handling path of sun8i_a83t_mipi_csi2_probe() | expand |
Hi Christophe, On Tue 23 Aug 22, 09:42, Christophe JAILLET wrote: > Release some resources in the error handling path of the probe and of > sun8i_a83t_mipi_csi2_resources_setup(), as already done in the remove > function. Looks good to me, thanks! Acked-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > Fixes: 576d196c522b ("media: sunxi: Add support for the A83T MIPI CSI-2 controller") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > I'm unsure about the phy_exit() call in > sun8i_a83t_mipi_csi2_resources_cleanup() because no explicit phy_init() > call is performed. > > The same code is in sun6i-mipi-csi2/sun6i_mipi_csi2.c, but in this driver > phy_init() IS called. > > I leave it as-is because I don't if it is an issue or not. > My feeling is that it is a copy'n'paste error and that it should be > removed. Actually it's a legitimate call. The d-phy is internal on A83T and it's registered in sun8i_a83t_dphy_register, which is called from sun8i_a83t_mipi_csi2_resources_setup. Cheers, Paul > Changes in v2: > * add some blank line [Paul Kocialkowski <paul.kocialkowski@bootlin.com>] > * rename the new labels [Paul Kocialkowski <paul.kocialkowski@bootlin.com>] > > v1: > https://lore.kernel.org/all/62c0aef8d3b86d8f290bf6787f1b2b41efbb0b55.1659295329.git.christophe.jaillet@wanadoo.fr/ > --- > .../sun8i_a83t_mipi_csi2.c | 23 +++++++++++++++---- > 1 file changed, 18 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c b/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c > index d052ee77ef0a..b032ec13a683 100644 > --- a/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c > +++ b/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c > @@ -719,13 +719,15 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de > csi2_dev->clock_mipi = devm_clk_get(dev, "mipi"); > if (IS_ERR(csi2_dev->clock_mipi)) { > dev_err(dev, "failed to acquire mipi clock\n"); > - return PTR_ERR(csi2_dev->clock_mipi); > + ret = PTR_ERR(csi2_dev->clock_mipi); > + goto error_clock_rate_exclusive; > } > > csi2_dev->clock_misc = devm_clk_get(dev, "misc"); > if (IS_ERR(csi2_dev->clock_misc)) { > dev_err(dev, "failed to acquire misc clock\n"); > - return PTR_ERR(csi2_dev->clock_misc); > + ret = PTR_ERR(csi2_dev->clock_misc); > + goto error_clock_rate_exclusive; > } > > /* Reset */ > @@ -733,7 +735,8 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de > csi2_dev->reset = devm_reset_control_get_shared(dev, NULL); > if (IS_ERR(csi2_dev->reset)) { > dev_err(dev, "failed to get reset controller\n"); > - return PTR_ERR(csi2_dev->reset); > + ret = PTR_ERR(csi2_dev->reset); > + goto error_clock_rate_exclusive; > } > > /* D-PHY */ > @@ -741,7 +744,7 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de > ret = sun8i_a83t_dphy_register(csi2_dev); > if (ret) { > dev_err(dev, "failed to initialize MIPI D-PHY\n"); > - return ret; > + goto error_clock_rate_exclusive; > } > > /* Runtime PM */ > @@ -749,6 +752,11 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de > pm_runtime_enable(dev); > > return 0; > + > +error_clock_rate_exclusive: > + clk_rate_exclusive_put(csi2_dev->clock_mod); > + > + return ret; > } > > static void > @@ -778,9 +786,14 @@ static int sun8i_a83t_mipi_csi2_probe(struct platform_device *platform_dev) > > ret = sun8i_a83t_mipi_csi2_bridge_setup(csi2_dev); > if (ret) > - return ret; > + goto error_resources; > > return 0; > + > +error_resources: > + sun8i_a83t_mipi_csi2_resources_cleanup(csi2_dev); > + > + return ret; > } > > static int sun8i_a83t_mipi_csi2_remove(struct platform_device *platform_dev) > -- > 2.34.1 >
diff --git a/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c b/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c index d052ee77ef0a..b032ec13a683 100644 --- a/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c +++ b/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c @@ -719,13 +719,15 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de csi2_dev->clock_mipi = devm_clk_get(dev, "mipi"); if (IS_ERR(csi2_dev->clock_mipi)) { dev_err(dev, "failed to acquire mipi clock\n"); - return PTR_ERR(csi2_dev->clock_mipi); + ret = PTR_ERR(csi2_dev->clock_mipi); + goto error_clock_rate_exclusive; } csi2_dev->clock_misc = devm_clk_get(dev, "misc"); if (IS_ERR(csi2_dev->clock_misc)) { dev_err(dev, "failed to acquire misc clock\n"); - return PTR_ERR(csi2_dev->clock_misc); + ret = PTR_ERR(csi2_dev->clock_misc); + goto error_clock_rate_exclusive; } /* Reset */ @@ -733,7 +735,8 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de csi2_dev->reset = devm_reset_control_get_shared(dev, NULL); if (IS_ERR(csi2_dev->reset)) { dev_err(dev, "failed to get reset controller\n"); - return PTR_ERR(csi2_dev->reset); + ret = PTR_ERR(csi2_dev->reset); + goto error_clock_rate_exclusive; } /* D-PHY */ @@ -741,7 +744,7 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de ret = sun8i_a83t_dphy_register(csi2_dev); if (ret) { dev_err(dev, "failed to initialize MIPI D-PHY\n"); - return ret; + goto error_clock_rate_exclusive; } /* Runtime PM */ @@ -749,6 +752,11 @@ sun8i_a83t_mipi_csi2_resources_setup(struct sun8i_a83t_mipi_csi2_device *csi2_de pm_runtime_enable(dev); return 0; + +error_clock_rate_exclusive: + clk_rate_exclusive_put(csi2_dev->clock_mod); + + return ret; } static void @@ -778,9 +786,14 @@ static int sun8i_a83t_mipi_csi2_probe(struct platform_device *platform_dev) ret = sun8i_a83t_mipi_csi2_bridge_setup(csi2_dev); if (ret) - return ret; + goto error_resources; return 0; + +error_resources: + sun8i_a83t_mipi_csi2_resources_cleanup(csi2_dev); + + return ret; } static int sun8i_a83t_mipi_csi2_remove(struct platform_device *platform_dev)
Release some resources in the error handling path of the probe and of sun8i_a83t_mipi_csi2_resources_setup(), as already done in the remove function. Fixes: 576d196c522b ("media: sunxi: Add support for the A83T MIPI CSI-2 controller") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- I'm unsure about the phy_exit() call in sun8i_a83t_mipi_csi2_resources_cleanup() because no explicit phy_init() call is performed. The same code is in sun6i-mipi-csi2/sun6i_mipi_csi2.c, but in this driver phy_init() IS called. I leave it as-is because I don't if it is an issue or not. My feeling is that it is a copy'n'paste error and that it should be removed. Changes in v2: * add some blank line [Paul Kocialkowski <paul.kocialkowski@bootlin.com>] * rename the new labels [Paul Kocialkowski <paul.kocialkowski@bootlin.com>] v1: https://lore.kernel.org/all/62c0aef8d3b86d8f290bf6787f1b2b41efbb0b55.1659295329.git.christophe.jaillet@wanadoo.fr/ --- .../sun8i_a83t_mipi_csi2.c | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-)