summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorJani Nikula <ext-jani.1.nikula@nokia.com>2010-04-29 10:55:09 +0300
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-05-25 10:16:01 +0100
commit23b5cc2ab6783256cf06779e1d522482b819b808 (patch)
tree14a9fdb2ee8742a543cd4d62d3890063718af772 /drivers/regulator
parent0178f3e28e2166664916265c5d4922b1376b9fa1 (diff)
downloadlinux-23b5cc2ab6783256cf06779e1d522482b819b808.tar.gz
linux-23b5cc2ab6783256cf06779e1d522482b819b808.tar.bz2
linux-23b5cc2ab6783256cf06779e1d522482b819b808.zip
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>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/core.c7
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;