From 257b51b83ec57f597528969b96eaf50257fdd27b Mon Sep 17 00:00:00 2001
From: Abhilash Kesavan <a.kesavan@samsung.com>
Date: Mon, 19 Nov 2012 15:47:17 +0530
Subject: [PATCH] --- yaml --- r: 347077 b: refs/heads/master c:
 658122fe5e3a72940631ceda3efcb841054d91dc h: refs/heads/master i:   347075:
 44f99c3ac4ded1518976d89aacf121d187c3f695 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/i2c/busses/i2c-s3c2410.c | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index b7098af2d9d7..585a47b361d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b2f3ceb3c7f4a8c2d11aa7652842e5ce1b0dcc3
+refs/heads/master: 658122fe5e3a72940631ceda3efcb841054d91dc
diff --git a/trunk/drivers/i2c/busses/i2c-s3c2410.c b/trunk/drivers/i2c/busses/i2c-s3c2410.c
index 16592e5ab08a..d784c76ae3e8 100644
--- a/trunk/drivers/i2c/busses/i2c-s3c2410.c
+++ b/trunk/drivers/i2c/busses/i2c-s3c2410.c
@@ -908,13 +908,6 @@ static int s3c24xx_i2c_init(struct s3c24xx_i2c *i2c)
 
 	pdata = i2c->pdata;
 
-	/* inititalise the gpio */
-
-	if (pdata->cfg_gpio)
-		pdata->cfg_gpio(to_platform_device(i2c->dev));
-	else if (IS_ERR(i2c->pctrl) && s3c24xx_i2c_parse_dt_gpio(i2c))
-		return -EINVAL;
-
 	/* write slave address */
 
 	writeb(pdata->slave_addr, i2c->regs + S3C2410_IICADD);
@@ -1055,6 +1048,15 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
 
 	i2c->pctrl = devm_pinctrl_get_select_default(i2c->dev);
 
+	/* inititalise the i2c gpio lines */
+
+	if (i2c->pdata->cfg_gpio) {
+		i2c->pdata->cfg_gpio(to_platform_device(i2c->dev));
+	} else if (IS_ERR(i2c->pctrl) && s3c24xx_i2c_parse_dt_gpio(i2c)) {
+		ret = -EINVAL;
+		goto err_clk;
+	}
+
 	/* initialise the i2c controller */
 
 	ret = s3c24xx_i2c_init(i2c);