1 files changed, 34 insertions, 3 deletions

diff --git a/drivers/power/bq27xxx_battery_i2c.c b/drivers/power/bq27xxx_battery_i2c.c
index 9429e66be096..8eafc6f0df88 100644
--- a/drivers/power/bq27xxx_battery_i2c.c
+++ b/drivers/power/bq27xxx_battery_i2c.c
@@ -21,6 +21,9 @@
 
 #include <linux/power/bq27xxx_battery.h>
 
+static DEFINE_IDR(battery_id);
+static DEFINE_MUTEX(battery_mutex);
+
 static irqreturn_t bq27xxx_battery_irq_handler_thread(int irq, void *data)
 {
         struct bq27xxx_device_info *di = data;
@@ -70,19 +73,33 @@ static int bq27xxx_battery_i2c_probe(struct i2c_client *client,
 {
         struct bq27xxx_device_info *di;
         int ret;
+        char *name;
+        int num;
+
+        /* Get new ID for the new battery device */
+        mutex_lock(&battery_mutex);
+        num = idr_alloc(&battery_id, client, 0, 0, GFP_KERNEL);
+        mutex_unlock(&battery_mutex);
+        if (num < 0)
+                return num;
+
+        name = devm_kasprintf(&client->dev, GFP_KERNEL, "%s-%d", id->name, num);
+        if (!name)
+                goto err_mem;
 
         di = devm_kzalloc(&client->dev, sizeof(*di), GFP_KERNEL);
         if (!di)
-                return -ENOMEM;
+                goto err_mem;
 
+        di->id = num;
         di->dev = &client->dev;
         di->chip = id->driver_data;
-        di->name = id->name;
+        di->name = name;
         di->bus.read = bq27xxx_battery_i2c_read;
 
         ret = bq27xxx_battery_setup(di);
         if (ret)
-                return ret;
+                goto err_failed;
 
         /* Schedule a polling after about 1 min */
         schedule_delayed_work(&di->work, 60 * HZ);
@@ -103,6 +120,16 @@ static int bq27xxx_battery_i2c_probe(struct i2c_client *client,
         }
 
         return 0;
+
+err_mem:
+        ret = -ENOMEM;
+
+err_failed:
+        mutex_lock(&battery_mutex);
+        idr_remove(&battery_id, num);
+        mutex_unlock(&battery_mutex);
+
+        return ret;
 }
 
 static int bq27xxx_battery_i2c_remove(struct i2c_client *client)
@@ -111,6 +138,10 @@ static int bq27xxx_battery_i2c_remove(struct i2c_client *client)
 
         bq27xxx_battery_teardown(di);
 
+        mutex_lock(&battery_mutex);
+        idr_remove(&battery_id, di->id);
+        mutex_unlock(&battery_mutex);
+
         return 0;
 }