Merge tag 'dax-locking-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / drivers / i2c / busses / i2c-mt65xx.c

diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c
index 453358b4d9ca7af7a6754c698d8dd51ddba286f6..d9373e60be8ae307336041581f3b8e10fcb0a0b3 100644 (file)
--- a/drivers/i2c/busses/i2c-mt65xx.c
+++ b/drivers/i2c/busses/i2c-mt65xx.c
@@ -413,10 +413,7 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs,
        else
                writew(I2C_FS_START_CON, i2c->base + OFFSET_EXT_CONF);
 
-       addr_reg = msgs->addr << 1;
-       if (i2c->op == I2C_MASTER_RD)
-               addr_reg |= 0x1;
-
+       addr_reg = i2c_8bit_addr_from_msg(msgs);
        writew(addr_reg, i2c->base + OFFSET_SLAVE_ADDR);
 
        /* Clear interrupt status */