Merge branch 'defconfigs-for-arnd' of git://git.linaro.org/people/triad/linux-stericsson into fixes

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index 85584a547c25..525c7345fa0b 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -488,7 +488,7 @@ static int bit_doAddress(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
 
         if (flags & I2C_M_TEN) {
                 /* a ten bit address */
-                addr = 0xf0 | ((msg->addr >> 7) & 0x03);
+                addr = 0xf0 | ((msg->addr >> 7) & 0x06);
                 bit_dbg(2, &i2c_adap->dev, "addr0: %d\n", addr);
                 /* try extended address code...*/
                 ret = try_address(i2c_adap, addr, retries);
@@ -498,7 +498,7 @@ static int bit_doAddress(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                         return -ENXIO;
                 }
                 /* the remaining 8 bit address */
-                ret = i2c_outb(i2c_adap, msg->addr & 0x7f);
+                ret = i2c_outb(i2c_adap, msg->addr & 0xff);
                 if ((ret != 1) && !nak_ok) {
                         /* the chip did not ack / xmission error occurred */
                         dev_err(&i2c_adap->dev, "died at 2nd address code\n");