i2c-nomadik: reset the hw after status check

In case of I2C timeout, reset the HW only after the HW status
is read, otherwise the staus will be lost.

Signed-off-by: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com>
Reviewed-by: Jonas Aberg <jonas.aberg@stericsson.com>
Reviewed-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index b2de1a56dc8d2b6fb70bf5e3464affaef35dc301..fa7b10639ce24cc8b3528d381dc6098633cc9600 100644 (file)
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -428,10 +428,9 @@ static int read_i2c(struct nmk_i2c_dev *dev)
        }
 
        if (timeout == 0) {
-               /* controller has timedout, re-init the h/w */
+               /* Controller timed out */
                dev_err(&dev->pdev->dev, "read from slave 0x%x timed out\n",
                                dev->cli.slave_adr);
-               (void) init_hw(dev);
                status = -ETIMEDOUT;
        }
        return status;
@@ -516,10 +515,9 @@ static int write_i2c(struct nmk_i2c_dev *dev)
        }
 
        if (timeout == 0) {
-               /* controller has timedout, re-init the h/w */
+               /* Controller timed out */
                dev_err(&dev->pdev->dev, "write to slave 0x%x timed out\n",
                                dev->cli.slave_adr);
-               (void) init_hw(dev);
                status = -ETIMEDOUT;
        }
 
@@ -638,6 +636,8 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
                                                abort_causes[cause]);
                                }
 
+                               (void) init_hw(dev);
+
                                status = status ? status : dev->result;
 
                                break;