From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Maxime Ripard <mripard@kernel.org>,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
linux-media@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev
Subject: Re: [PATCH 2/2] media: sunxi: Fix some error handling path of sun6i_mipi_csi2_probe()
Date: Fri, 5 Aug 2022 16:11:41 +0200 [thread overview]
Message-ID: <Yu0lHcp63DwF0DBI@aptenodytes> (raw)
In-Reply-To: <9999a30560d0ab8201734cbab0483c6f840402da.1659295329.git.christophe.jaillet@wanadoo.fr>
[-- Attachment #1.1: Type: text/plain, Size: 2826 bytes --]
Hi Christophe,
On Sun 31 Jul 22, 21:22, Christophe JAILLET wrote:
> Release some resources in the error handling path of the probe and of
> sun6i_mipi_csi2_resources_setup(), as already done in the remove
> function.
Thanks again, my comments are the same as in the other patch!
> Fixes: af54b4f4c17f ("media: sunxi: Add support for the A31 MIPI CSI-2 controller")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
> index a4e3f9a6b2ff..1ee8501e25f6 100644
> --- a/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
> +++ b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c
> @@ -661,7 +661,8 @@ sun6i_mipi_csi2_resources_setup(struct sun6i_mipi_csi2_device *csi2_dev,
> 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 err_put_clk_rate;
> }
>
> /* D-PHY */
> @@ -669,13 +670,14 @@ sun6i_mipi_csi2_resources_setup(struct sun6i_mipi_csi2_device *csi2_dev,
> csi2_dev->dphy = devm_phy_get(dev, "dphy");
> if (IS_ERR(csi2_dev->dphy)) {
> dev_err(dev, "failed to get MIPI D-PHY\n");
> - return PTR_ERR(csi2_dev->dphy);
> + ret = PTR_ERR(csi2_dev->dphy);
> + goto err_put_clk_rate;
> }
>
> ret = phy_init(csi2_dev->dphy);
> if (ret) {
> dev_err(dev, "failed to initialize MIPI D-PHY\n");
> - return ret;
> + goto err_put_clk_rate;
> }
>
> /* Runtime PM */
> @@ -683,6 +685,10 @@ sun6i_mipi_csi2_resources_setup(struct sun6i_mipi_csi2_device *csi2_dev,
> pm_runtime_enable(dev);
>
> return 0;
> +
> +err_put_clk_rate:
Please call this "error_clock_rate_exclusive",
> + clk_rate_exclusive_put(csi2_dev->clock_mod);
and add a blank line here.
> + return ret;
> }
>
> static void
> @@ -712,9 +718,13 @@ static int sun6i_mipi_csi2_probe(struct platform_device *platform_dev)
>
> ret = sun6i_mipi_csi2_bridge_setup(csi2_dev);
> if (ret)
> - return ret;
> + goto err_cleanup_resources;
>
> return 0;
> +
> +err_cleanup_resources:
Please call this "error_resources",
> + sun6i_mipi_csi2_resources_cleanup(csi2_dev);
and add a blank line here.
Thanks,
Paul
> + return ret;
> }
>
> static int sun6i_mipi_csi2_remove(struct platform_device *platform_dev)
> --
> 2.34.1
>
--
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-08-05 14:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-31 19:22 [PATCH 1/2] media: sunxi: Fix some error handling path of sun8i_a83t_mipi_csi2_probe() Christophe JAILLET
2022-07-31 19:22 ` [PATCH 2/2] media: sunxi: Fix some error handling path of sun6i_mipi_csi2_probe() Christophe JAILLET
2022-08-05 14:11 ` Paul Kocialkowski [this message]
2022-08-05 14:10 ` [PATCH 1/2] media: sunxi: Fix some error handling path of sun8i_a83t_mipi_csi2_probe() Paul Kocialkowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Yu0lHcp63DwF0DBI@aptenodytes \
--to=paul.kocialkowski@bootlin.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jernej.skrabec@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=samuel@sholland.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).