From: Wolfram Sang <wsa@kernel.org>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: f.fainelli@gmail.com, rjui@broadcom.com, sbranden@broadcom.com,
nsaenz@kernel.org, krzk@kernel.org, stefan.wahren@i2se.com,
nh6z@nh6z.net, eric@anholt.net, linux-i2c@vger.kernel.org,
linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] i2c: bcm2835: Fix the error handling in 'bcm2835_i2c_probe()'
Date: Fri, 29 Oct 2021 22:07:53 +0200 [thread overview]
Message-ID: <YXxUmXtXBR3Oy0C3@kunai> (raw)
In-Reply-To: <338008c444af4785a07fb5a402b60225a4964ae9.1629484876.git.christophe.jaillet@wanadoo.fr>
[-- Attachment #1: Type: text/plain, Size: 2291 bytes --]
On Fri, Aug 20, 2021 at 08:43:33PM +0200, Christophe JAILLET wrote:
> Some resource should be released if an error occurs in
> 'bcm2835_i2c_probe()'.
> Add an error handling path and the needed 'clk_disable_unprepare()' and
> 'clk_rate_exclusive_put()' calls.
>
> While at it, rework the bottom of the function to use this newly added
> error handling path and have an explicit and more standard "return 0;" at
> the end of the normal path.
>
> Fixes: bebff81fb8b9 ("i2c: bcm2835: Model Divider in CCF")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Could someone from the BCM community kindly test/approve this change?
> ---
> drivers/i2c/busses/i2c-bcm2835.c | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
> index 37443edbf754..a2f19b4c2402 100644
> --- a/drivers/i2c/busses/i2c-bcm2835.c
> +++ b/drivers/i2c/busses/i2c-bcm2835.c
> @@ -449,13 +449,14 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
> ret = clk_prepare_enable(i2c_dev->bus_clk);
> if (ret) {
> dev_err(&pdev->dev, "Couldn't prepare clock");
> - return ret;
> + goto err_put_exclusive_rate;
> }
>
> irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
> if (!irq) {
> dev_err(&pdev->dev, "No IRQ resource\n");
> - return -ENODEV;
> + ret = -ENODEV;
> + goto err_disable_unprepare_clk;
> }
> i2c_dev->irq = irq->start;
>
> @@ -463,7 +464,7 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
> dev_name(&pdev->dev), i2c_dev);
> if (ret) {
> dev_err(&pdev->dev, "Could not request IRQ\n");
> - return -ENODEV;
> + goto err_disable_unprepare_clk;
> }
>
> adap = &i2c_dev->adapter;
> @@ -481,7 +482,16 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
>
> ret = i2c_add_adapter(adap);
> if (ret)
> - free_irq(i2c_dev->irq, i2c_dev);
> + goto err_free_irq;
> +
> + return 0;
> +
> +err_free_irq:
> + free_irq(i2c_dev->irq, i2c_dev);
> +err_disable_unprepare_clk:
> + clk_disable_unprepare(i2c_dev->bus_clk);
> +err_put_exclusive_rate:
> + clk_rate_exclusive_put(i2c_dev->bus_clk);
>
> return ret;
> }
> --
> 2.30.2
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2021-10-29 20:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-20 18:43 [PATCH] i2c: bcm2835: Fix the error handling in 'bcm2835_i2c_probe()' Christophe JAILLET
2021-10-29 20:07 ` Wolfram Sang [this message]
2022-02-07 14:47 ` Wolfram Sang
2022-02-10 19:50 ` Christophe JAILLET
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=YXxUmXtXBR3Oy0C3@kunai \
--to=wsa@kernel.org \
--cc=christophe.jaillet@wanadoo.fr \
--cc=eric@anholt.net \
--cc=f.fainelli@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=nh6z@nh6z.net \
--cc=nsaenz@kernel.org \
--cc=rjui@broadcom.com \
--cc=sbranden@broadcom.com \
--cc=stefan.wahren@i2se.com \
/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).