1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 55e5ea62ccee..18067b3ee8c9 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -476,12 +476,15 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
         packet_header = msg->len - 1;
         i2c_writel(i2c_dev, packet_header, I2C_TX_FIFO);
 
-        packet_header = msg->addr << I2C_HEADER_SLAVE_ADDR_SHIFT;
-        packet_header |= I2C_HEADER_IE_ENABLE;
+        packet_header = I2C_HEADER_IE_ENABLE;
         if (!stop)
                 packet_header |= I2C_HEADER_REPEAT_START;
-        if (msg->flags & I2C_M_TEN)
+        if (msg->flags & I2C_M_TEN) {
+                packet_header |= msg->addr;
                 packet_header |= I2C_HEADER_10BIT_ADDR;
+        } else {
+                packet_header |= msg->addr << I2C_HEADER_SLAVE_ADDR_SHIFT;
+        }
         if (msg->flags & I2C_M_IGNORE_NAK)
                 packet_header |= I2C_HEADER_CONT_ON_NAK;
         if (msg->flags & I2C_M_RD)
@@ -557,7 +560,7 @@ static int tegra_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[],
 
 static u32 tegra_i2c_func(struct i2c_adapter *adap)
 {
-        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
+        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR;
 }
 
 static const struct i2c_algorithm tegra_i2c_algo = {