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>

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index eb112d961515..2a3494f72465 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -944,8 +944,13 @@ static int set_consumer_device_supply(struct regulator_dev *rdev,
                 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;