Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc6bcf7d authored by Jeffrey (Sheng-Hui) Chu's avatar Jeffrey (Sheng-Hui) Chu Committed by Jean Delvare
Browse files

i2c-algo-bit: Generate correct i2c address sequence for 10-bit target 



The wrong bits were put on the wire, fix that.

This fixes kernel bug #42562.

Signed-off-by: default avatarSheng-Hui J. Chu <jeffchu@broadcom.com>
Cc: stable@kernel.org
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent b4bbb029

drivers/i2c/algos/i2c-algo-bit.c

+2 −2
Original line number Diff line number Diff line
@@ -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");