From 518cf106d2d708ab210771e35a5c840156e1ccc0 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 24 Jul 2012 14:13:59 +0200 Subject: [PATCH] --- yaml --- r: 316359 b: refs/heads/master c: fb604a3d58b79ef722942f664f11dee5e1f73ea4 h: refs/heads/master i: 316357: 2fc146c75e640babf982e1838d3f103344864f0a 316355: 7be0e344efae5f57471273c70494b7b8a97bb9d3 316351: 3a48e5f9aeca5901be3f89d88071ec13cd22ac95 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-omap.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 58ca860c7559..b57fb4d57ba2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72fc2c7f78b0c365454e60ad33b0e74aea43e3ab +refs/heads/master: fb604a3d58b79ef722942f664f11dee5e1f73ea4 diff --git a/trunk/drivers/i2c/busses/i2c-omap.c b/trunk/drivers/i2c/busses/i2c-omap.c index 801df6000e9b..c2148332de0f 100644 --- a/trunk/drivers/i2c/busses/i2c-omap.c +++ b/trunk/drivers/i2c/busses/i2c-omap.c @@ -545,6 +545,8 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap, if (dev->speed > 400) w |= OMAP_I2C_CON_OPMODE_HS; + if (msg->flags & I2C_M_STOP) + stop = 1; if (msg->flags & I2C_M_TEN) w |= OMAP_I2C_CON_XA; if (!(msg->flags & I2C_M_RD)) @@ -658,7 +660,8 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) static u32 omap_i2c_func(struct i2c_adapter *adap) { - return I2C_FUNC_I2C | (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK); + return I2C_FUNC_I2C | (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK) | + I2C_FUNC_PROTOCOL_MANGLING; } static inline void