aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorMike J. Chen <mjchen@google.com>2011-06-07 15:35:34 -0700
committerGerrit Code Review <gerrit2@git.omapzoom.org>2012-10-18 07:04:37 -0500
commit77961d4ee57118a7de2c8398e34c1ba64c859002 (patch)
treed580d021b73382120272bd193fb449c7a6e3ef55 /drivers/i2c
parenta4a16a532bbeb2861bba0a39c2e9679fb69aa0ea (diff)
downloadkernel_samsung_espresso10-77961d4ee57118a7de2c8398e34c1ba64c859002.tar.gz
kernel_samsung_espresso10-77961d4ee57118a7de2c8398e34c1ba64c859002.tar.bz2
kernel_samsung_espresso10-77961d4ee57118a7de2c8398e34c1ba64c859002.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 aa8fbd95135..126db2dae16 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -656,6 +656,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;