Merge branch 'pm-sleep'

[karo-tx-linux.git] / drivers / i2c / busses / i2c-cpm.c

diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index b167ab25310a3b53797a8604d0adf360d91fb3e9..ee57c1e865e271228a38484d03c1c02c979fa7a9 100644 (file)
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -197,9 +197,7 @@ static void cpm_i2c_parse_message(struct i2c_adapter *adap,
        tbdf = cpm->tbase + tx;
        rbdf = cpm->rbase + rx;
 
-       addr = pmsg->addr << 1;
-       if (pmsg->flags & I2C_M_RD)
-               addr |= 1;
+       addr = i2c_8bit_addr_from_msg(pmsg);
 
        tb = cpm->txbuf[tx];
        rb = cpm->rxbuf[rx];