i2c: atr: allow replacing mappings in attach_addr()

It is possible for aliases to be exhausted while we are still attaching
children.

Allow replacing mapping on attach by calling
i2c_atr_replace_mapping_by_addr() if i2c_atr_create_mapping_by_addr()
fails.

Signed-off-by: Cosmin Tanislav <demonsingur@gmail.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

diff --git a/drivers/i2c/i2c-atr.c b/drivers/i2c/i2c-atr.c
index 5353de8d3c2e8b91e902e90e3d22f3831d176edc..f3fd52588e421212e610ed083a77bac36cd6a61d 100644 (file)
--- a/drivers/i2c/i2c-atr.c
+++ b/drivers/i2c/i2c-atr.c
@@ -543,6 +543,9 @@ static int i2c_atr_attach_addr(struct i2c_adapter *adapter,
        mutex_lock(&chan->alias_pairs_lock);
 
        c2a = i2c_atr_create_mapping_by_addr(chan, addr);
+       if (!c2a)
+               c2a = i2c_atr_replace_mapping_by_addr(chan, addr);
+
        if (!c2a) {
                dev_err(atr->dev, "failed to find a free alias\n");
                ret = -EBUSY;