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@xxxxxxxxxx>
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:
signature.asc
Description: PGP signature
