aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorMike J. Chen <mjchen@google.com>2011-06-07 15:35:34 -0700
committerZiyann <jaraidaniel@gmail.com>2014-10-01 12:59:11 +0200
commit382ca415c67dbfa26913b9ffbaafdc99ed7d8bbb (patch)
treec5c11f72f504070f03429c2991209a72ead175d3 /drivers/i2c
parentd060afc233394de9aa6b7ae37d8db9a952130193 (diff)
downloadkernel_samsung_tuna-382ca415c67dbfa26913b9ffbaafdc99ed7d8bbb.tar.gz
kernel_samsung_tuna-382ca415c67dbfa26913b9ffbaafdc99ed7d8bbb.tar.bz2
kernel_samsung_tuna-382ca415c67dbfa26913b9ffbaafdc99ed7d8bbb.zip
I2C: omap: Fix error condition when slave sends a NAK
Fix an issue in the omap i2c host controller driver where it was not properly clearing out an error condition in the unit after a NAK'ed transaction causing the subsequent transaction to time out. Change-Id: I5cdc8e740acdbc8116dca4d13f1a2cee37f75582 Signed-off-by: Mike J. Chen <mjchen@google.com> Signed-off-by: Ruslan Bilovol <ruslan.bilovol@ti.com>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-omap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 125013778f6..75d15bc73b2 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -666,6 +666,7 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap,
w |= OMAP_I2C_CON_STP;
omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, w);
}
+ omap_i2c_init(dev);
return -EREMOTEIO;
}
return -EIO;