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

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

diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index b6c080334297345e20e97f272efecab086dc6694..cdaa7be2cd1b940647df6d98b11edd8a2f7c67ef 100644 (file)
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -269,7 +269,7 @@ static int iic_smbus_quick(struct ibm_iic_private* dev, const struct i2c_msg* p)
        ndelay(t->hd_sta);
 
        /* Send address */
-       v = (u8)((p->addr << 1) | ((p->flags & I2C_M_RD) ? 1 : 0));
+       v = i2c_8bit_addr_from_msg(p);
        for (i = 0, mask = 0x80; i < 8; ++i, mask >>= 1){
                out_8(&iic->directcntl, sda);
                ndelay(t->low / 2);