From 80c7aaf78fcb5feb7b77ad89bc134bc77cb34287 Mon Sep 17 00:00:00 2001
From: Jani Nikula <ext-jani.1.nikula@nokia.com>
Date: Thu, 29 Apr 2010 10:55:11 +0300
Subject: [PATCH] --- yaml --- r: 198382 b: refs/heads/master c:
 d4033b54fc91221b13e2850bf298683c0f2ff37d h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/regulator/core.c | 35 +++++-----------------------------
 2 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/[refs] b/[refs]
index 521427b6e80f..6215f025a2f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47bd53f0e8008294ff58c5b37d713f25a8dc56aa
+refs/heads/master: d4033b54fc91221b13e2850bf298683c0f2ff37d
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index a50672f33afa..98e5d14f94f3 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -981,29 +981,6 @@ static int set_consumer_device_supply(struct regulator_dev *rdev,
 	return 0;
 }
 
-static void unset_consumer_device_supply(struct regulator_dev *rdev,
-	const char *consumer_dev_name, struct device *consumer_dev)
-{
-	struct regulator_map *node, *n;
-
-	if (consumer_dev && !consumer_dev_name)
-		consumer_dev_name = dev_name(consumer_dev);
-
-	list_for_each_entry_safe(node, n, &regulator_map_list, list) {
-		if (rdev != node->regulator)
-			continue;
-
-		if (consumer_dev_name && node->dev_name &&
-		    strcmp(consumer_dev_name, node->dev_name))
-			continue;
-
-		list_del(&node->list);
-		kfree(node->dev_name);
-		kfree(node);
-		return;
-	}
-}
-
 static void unset_regulator_supplies(struct regulator_dev *rdev)
 {
 	struct regulator_map *node, *n;
@@ -2375,13 +2352,8 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
 			init_data->consumer_supplies[i].dev,
 			init_data->consumer_supplies[i].dev_name,
 			init_data->consumer_supplies[i].supply);
-		if (ret < 0) {
-			for (--i; i >= 0; i--)
-				unset_consumer_device_supply(rdev,
-				    init_data->consumer_supplies[i].dev_name,
-				    init_data->consumer_supplies[i].dev);
-			goto scrub;
-		}
+		if (ret < 0)
+			goto unset_supplies;
 	}
 
 	list_add(&rdev->list, &regulator_list);
@@ -2389,6 +2361,9 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
 	mutex_unlock(&regulator_list_mutex);
 	return rdev;
 
+unset_supplies:
+	unset_regulator_supplies(rdev);
+
 scrub:
 	device_unregister(&rdev->dev);
 	/* device core frees rdev */