All of lore.kernel.org
 help / color / mirror / Atom feed
From: Miaoqian Lin <linmq006@gmail.com>
To: Ard Biesheuvel <ardb@kernel.org>,
	Andy Shevchenko <andy.shevchenko@gmail.com>,
	Wolfram Sang <wsa@kernel.org>,
	linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: linmq006@gmail.com
Subject: [PATCH] i2c: busses: Fix error handling in synquacer_i2c_probe
Date: Wed, 16 Mar 2022 06:47:16 +0000	[thread overview]
Message-ID: <20220316064716.16587-1-linmq006@gmail.com> (raw)

In the error handling path, the clk_prepare_enable() function
call should be balanced by a corresponding 'clk_disable_unprepare()'
call, as already done in the remove function.

Fixes: 0d676a6c4390 ("i2c: add support for Socionext SynQuacer I2C controller")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
 drivers/i2c/busses/i2c-synquacer.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/drivers/i2c/busses/i2c-synquacer.c b/drivers/i2c/busses/i2c-synquacer.c
index e4026c5416b1..cd955224d629 100644
--- a/drivers/i2c/busses/i2c-synquacer.c
+++ b/drivers/i2c/busses/i2c-synquacer.c
@@ -569,22 +569,27 @@ static int synquacer_i2c_probe(struct platform_device *pdev)
 	    i2c->pclkrate > SYNQUACER_I2C_MAX_CLK_RATE) {
 		dev_err(&pdev->dev, "PCLK missing or out of range (%d)\n",
 			i2c->pclkrate);
-		return -EINVAL;
+		ret = -EINVAL;
+		goto err_disable_clk;
 	}
 
 	i2c->base = devm_platform_ioremap_resource(pdev, 0);
-	if (IS_ERR(i2c->base))
-		return PTR_ERR(i2c->base);
+	if (IS_ERR(i2c->base)) {
+		ret = PTR_ERR(i2c->base);
+		goto err_disable_clk;
+	}
 
 	i2c->irq = platform_get_irq(pdev, 0);
-	if (i2c->irq < 0)
-		return i2c->irq;
+	if (i2c->irq < 0) {
+		ret = i2c->irq;
+		goto err_disable_clk;
+	}
 
 	ret = devm_request_irq(&pdev->dev, i2c->irq, synquacer_i2c_isr,
 			       0, dev_name(&pdev->dev), i2c);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "cannot claim IRQ %d\n", i2c->irq);
-		return ret;
+		goto err_disable_clk;
 	}
 
 	i2c->state = STATE_IDLE;
@@ -607,7 +612,7 @@ static int synquacer_i2c_probe(struct platform_device *pdev)
 	ret = i2c_add_numbered_adapter(&i2c->adapter);
 	if (ret) {
 		dev_err(&pdev->dev, "failed to add bus to i2c core\n");
-		return ret;
+		goto err_disable_clk;
 	}
 
 	platform_set_drvdata(pdev, i2c);
@@ -616,6 +621,11 @@ static int synquacer_i2c_probe(struct platform_device *pdev)
 		 dev_name(&i2c->adapter.dev));
 
 	return 0;
+
+err_disable_clk:
+	if (!IS_ERR(i2c->pclk))
+		clk_disable_unprepare(i2c->pclk);
+	return ret;
 }
 
 static int synquacer_i2c_remove(struct platform_device *pdev)
-- 
2.17.1


             reply	other threads:[~2022-03-16  6:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-16  6:47 Miaoqian Lin [this message]
     [not found] ` <CAHp75Veae=8Ev-xU3zbVYh=AxbAPFayZD3MeRSrAGNNZ8LMBPg@mail.gmail.com>
2022-03-16  7:18   ` [PATCH] i2c: busses: Fix error handling in synquacer_i2c_probe Miaoqian Lin
2022-03-16 15:42     ` Andy Shevchenko

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=20220316064716.16587-1-linmq006@gmail.com \
    --to=linmq006@gmail.com \
    --cc=andy.shevchenko@gmail.com \
    --cc=ardb@kernel.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=wsa@kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.