diff options
| author | Jean Delvare <khali@linux-fr.org> | 2011-11-23 14:33:07 +0400 |
|---|---|---|
| committer | Jean Delvare <khali@endymion.delvare> | 2011-11-23 14:33:07 +0400 |
| commit | cbb44514048a250647c6c6b3df27ff62cb71f7d5 (patch) | |
| tree | 47b64df0a06edd7f7eca94d2f9f8d08f070b1ef5 /drivers/i2c | |
| parent | cc6bcf7d2ec2234e7b41770185e4dc826390185e (diff) | |
| download | linux-cbb44514048a250647c6c6b3df27ff62cb71f7d5.tar.xz | |
i2c: Fix device name for 10-bit slave address
10-bit addresses overlap with traditional 7-bit addresses, leading in
device name collisions. Add an arbitrary offset to 10-bit addresses to
prevent this collision. The offset was chosen so that the address is
still easily recognizable.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/i2c-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 131079a3e292..1e5606185b4f 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -539,8 +539,10 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info) client->dev.type = &i2c_client_type; client->dev.of_node = info->of_node; + /* For 10-bit clients, add an arbitrary offset to avoid collisions */ dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap), - client->addr); + client->addr | ((client->flags & I2C_CLIENT_TEN) + ? 0xa000 : 0)); status = device_register(&client->dev); if (status) goto out_err; |