public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: javier@osg.samsung.com (Javier Martinez Canillas)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 2/2] i2c: s3c2410: Check clk_prepare_enable() return value
Date: Wed, 20 Apr 2016 10:37:56 -0400	[thread overview]
Message-ID: <1461163076-5959-2-git-send-email-javier@osg.samsung.com> (raw)
In-Reply-To: <1461163076-5959-1-git-send-email-javier@osg.samsung.com>

The clk_prepare_enable() function can fail so check the return
value and propagate the error in case of a failure.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

---

Changes in v2:
- Don't print the errno code since that's already printed by the
  core when probe fails. Suggested by Krzysztof Kozlowski.

 drivers/i2c/busses/i2c-s3c2410.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 13f67df65c45..8a9ea0c1e41d 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -1196,7 +1196,12 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
 
 	/* initialise the i2c controller */
 
-	clk_prepare_enable(i2c->clk);
+	ret = clk_prepare_enable(i2c->clk);
+	if (ret) {
+		dev_err(&pdev->dev, "I2C clock enable failed\n");
+		return ret;
+	}
+
 	ret = s3c24xx_i2c_init(i2c);
 	clk_disable(i2c->clk);
 	if (ret != 0) {
-- 
2.5.5

  reply	other threads:[~2016-04-20 14:37 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-20 14:37 [PATCH v2 1/2] i2c: s3c2410: Print errno code in error logs Javier Martinez Canillas
2016-04-20 14:37 ` Javier Martinez Canillas [this message]
2016-04-21  7:19   ` [PATCH v2 2/2] i2c: s3c2410: Check clk_prepare_enable() return value Krzysztof Kozlowski
2016-04-25 22:20   ` Wolfram Sang
2016-04-21  7:18 ` [PATCH v2 1/2] i2c: s3c2410: Print errno code in error logs Krzysztof Kozlowski
2016-04-25 22:20 ` Wolfram Sang

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=1461163076-5959-2-git-send-email-javier@osg.samsung.com \
    --to=javier@osg.samsung.com \
    --cc=linux-arm-kernel@lists.infradead.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