From 2cf997fe8bd08b7f388aed42191dd4f9ea00cfa0 Mon Sep 17 00:00:00 2001
From: Rhyland Klein <rklein@nvidia.com>
Date: Mon, 5 Dec 2011 17:50:49 -0800
Subject: [PATCH] --- yaml --- r: 283476 b: refs/heads/master c:
 52f56c69beb049928f6e1a3d484afe27843d6c04 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/power/sbs-battery.c | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 285f3ade3cd3..4b2fe677e7ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e57f1b68c4066459ed9e49177cdcefa6973ce9d2
+refs/heads/master: 52f56c69beb049928f6e1a3d484afe27843d6c04
diff --git a/trunk/drivers/power/sbs-battery.c b/trunk/drivers/power/sbs-battery.c
index 00bd9e079e80..b677b88da00f 100644
--- a/trunk/drivers/power/sbs-battery.c
+++ b/trunk/drivers/power/sbs-battery.c
@@ -682,15 +682,24 @@ static int __devinit sbs_probe(struct i2c_client *client,
 	struct sbs_platform_data *pdata = client->dev.platform_data;
 	int rc;
 	int irq;
+	char *name;
 
-	chip = kzalloc(sizeof(struct sbs_info), GFP_KERNEL);
-	if (!chip)
+	name = kasprintf(GFP_KERNEL, "sbs-%s", dev_name(&client->dev));
+	if (!name) {
+		dev_err(&client->dev, "Failed to allocate device name\n");
 		return -ENOMEM;
+	}
+
+	chip = kzalloc(sizeof(struct sbs_info), GFP_KERNEL);
+	if (!chip) {
+		rc = -ENOMEM;
+		goto exit_free_name;
+	}
 
 	chip->client = client;
 	chip->enable_detection = false;
 	chip->gpio_detect = false;
-	chip->power_supply.name = "battery";
+	chip->power_supply.name = name;
 	chip->power_supply.type = POWER_SUPPLY_TYPE_BATTERY;
 	chip->power_supply.properties = sbs_properties;
 	chip->power_supply.num_properties = ARRAY_SIZE(sbs_properties);
@@ -775,6 +784,9 @@ static int __devinit sbs_probe(struct i2c_client *client,
 
 	kfree(chip);
 
+exit_free_name:
+	kfree(name);
+
 	return rc;
 }
 
@@ -791,6 +803,7 @@ static int __devexit sbs_remove(struct i2c_client *client)
 
 	cancel_delayed_work_sync(&chip->work);
 
+	kfree(chip->power_supply.name);
 	kfree(chip);
 	chip = NULL;