Merge branch 'for-4.7-dw' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

[cascardo/linux.git] / drivers / i2c / busses / i2c-iop3xx.c

diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index 72d6161..85cbe4b 100644 (file)
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -50,10 +50,7 @@ iic_cook_addr(struct i2c_msg *msg)
 {
        unsigned char addr;
 
-       addr = (msg->addr << 1);
-
-       if (msg->flags & I2C_M_RD)
-               addr |= 1;
+       addr = i2c_8bit_addr_from_msg(msg);
 
        return addr;
 }