commit 23b5cc2ab6783256cf06779e1d522482b819b808
author Jani Nikula <ext-jani.1.nikula@nokia.com> Thu Apr 29 10:55:09 2010 +0300
committer Liam Girdwood <lrg@slimlogic.co.uk> Tue May 25 10:16:01 2010 +0100
tree 14a9fdb2ee8742a543cd4d62d3890063718af772
parent 0178f3e28e2166664916265c5d4922b1376b9fa1

regulator: prevent registration of matching regulator consumer supplies

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Pointer comparison is not sufficient for non-NULL device name matching,
so use strcmp(). Otherwise the semantics remain the same.

Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

drivers/regulator/core.c

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index eb112d9..2a3494f 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -944,8 +944,13 @@
 		has_dev = 0;
 
 	list_for_each_entry(node, &regulator_map_list, list) {
-		if (consumer_dev_name != node->dev_name)
+		if (node->dev_name && consumer_dev_name) {
+			if (strcmp(node->dev_name, consumer_dev_name) != 0)
+				continue;
+		} else if (node->dev_name || consumer_dev_name) {
 			continue;
+		}
+
 		if (strcmp(node->supply, supply) != 0)
 			continue;