From: Javier Martinez Canillas <javier@osg.samsung.com>
Date: Wed, 20 Apr 2016 14:37:56 +0000 (-0400)
Subject: i2c: s3c2410: Check clk_prepare_enable() return value
X-Git-Tag: v4.7-rc1~113^2~24
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d16415b2627e91a45778e1888bfdd5c6744294bf;p=karo-tx-linux.git

i2c: s3c2410: Check clk_prepare_enable() return value

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>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---

diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index c08830549578..38dc1cacfd8b 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -1158,7 +1158,12 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
 		return -EINVAL;
 
 	/* 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) {