Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into...

[firefly-linux-kernel-4.4.55.git] / drivers / i2c / algos / i2c-algo-bit.c

diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
old mode 100644 (file)
new mode 100755 (executable)
index a39e6cf..1c83580
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -362,7 +362,7 @@ static int sendbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                 * the SMBus PEC was wrong.
                 */
                } else if (retval == 0) {
-                       dev_err(&i2c_adap->dev, "sendbytes: NAK bailout.\n");
+                       dev_err(&i2c_adap->dev, "sendbytes: NAK bailout, addr is 0x%x.\n", msg->addr);
                        return -EIO;
 
                /* Timeout; or (someday) lost arbitration
@@ -373,8 +373,8 @@ static int sendbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                 * to know or care about this ... it is *NOT* an error.
                 */
                } else {
-                       dev_err(&i2c_adap->dev, "sendbytes: error %d\n",
-                                       retval);
+                       dev_err(&i2c_adap->dev, "sendbytes: error %d, addr is 0x%x.\n",
+                                       retval, msg->addr);
                        return retval;
                }
        }
@@ -528,6 +528,7 @@ static int bit_xfer(struct i2c_adapter *i2c_adap,
        }
 
        bit_dbg(3, &i2c_adap->dev, "emitting start condition\n");
+       adap->udelay = 500 * 1000/msgs[0].scl_rate + 1;
        i2c_start(adap);
        for (i = 0; i < num; i++) {
                pmsg = &msgs[i];