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

Commit 9bccc70a authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: take address space into account when checking for used addresses 



It is not enough to compare the plain address value, we also need to
check the flags enabling a different address space. E.g. it is valid to
have address 0x50 as a 7-bit address and 0x050 as 10-bit address on the
same bus. Same for addresses when we are the slave.

Tested-by: default avatarAndrey Danin <danindrey@mail.ru>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent b4e2f6ac

drivers/i2c/i2c-core.c

+4 −4
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ static int __i2c_check_addr_busy(struct device *dev, void *addrp) 
	struct i2c_client	*client = i2c_verify_client(dev);

	int			addr = *(int *)addrp;



	if (client && client->addr == addr)

	if (client && i2c_encode_flags_to_addr(client) == addr)

		return -EBUSY;

	return 0;

}
@@ -993,7 +993,7 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info) 
	}



	/* Check for address business */

	status = i2c_check_addr_busy(adap, client->addr);

	status = i2c_check_addr_busy(adap, i2c_encode_flags_to_addr(client));

	if (status)

		goto out_err;
@@ -2315,7 +2315,7 @@ static int i2c_detect_address(struct i2c_client *temp_client, 
		return err;

	}



	/* Skip if already in use */

	/* Skip if already in use (7 bit, no need to encode flags) */

	if (i2c_check_addr_busy(adapter, addr))

		return 0;
@@ -2431,7 +2431,7 @@ i2c_new_probed_device(struct i2c_adapter *adap, 
			continue;

		}



		/* Check address availability */

		/* Check address availability (7 bit, no need to encode flags) */

		if (i2c_check_addr_busy(adap, addr_list[i])) {

			dev_dbg(&adap->dev, "Address 0x%02x already in "

				"use, not probing\n", addr_list[i]);