summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorDmitry Bazhenov <dmitry.bazhenov@auriga.com>2016-09-21 08:51:02 +0200
committerWolfram Sang <wsa@the-dreams.de>2016-09-21 22:58:25 +0200
commite7051556b63dac163a82db6e6f324196c0c81e5b (patch)
tree700377f67d7f23bc4950380d787580da2673bfca /drivers/i2c
parenti2c: rcar: add support for r8a7796 (R-Car M3-W) (diff)
downloadlinux-e7051556b63dac163a82db6e6f324196c0c81e5b.tar.xz
linux-e7051556b63dac163a82db6e6f324196c0c81e5b.zip
i2c: octeon: Fix set SCL recovery function
The set SCL recovery function unconditionally pulls the SCL line low. Only pull SCL line low according to val parameter. Signed-off-by: Dmitry Bazhenov <dmitry.bazhenov@auriga.com> Signed-off-by: Jan Glauber <jglauber@cavium.com> [Changed commit message] Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-octeon-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-octeon-core.c b/drivers/i2c/busses/i2c-octeon-core.c
index f45ea5eef513..f322242cdbf8 100644
--- a/drivers/i2c/busses/i2c-octeon-core.c
+++ b/drivers/i2c/busses/i2c-octeon-core.c
@@ -767,7 +767,7 @@ static void octeon_i2c_set_scl(struct i2c_adapter *adap, int val)
{
struct octeon_i2c *i2c = i2c_get_adapdata(adap);
- octeon_i2c_write_int(i2c, TWSI_INT_SCL_OVR);
+ octeon_i2c_write_int(i2c, val ? 0 : TWSI_INT_SCL_OVR);
}
static int octeon_i2c_get_sda(struct i2c_adapter *adap)