Skip to content

Commit

Permalink
regulator: prevent registration of matching regulator consumer supplies
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jani Nikula authored and Liam Girdwood committed May 25, 2010
1 parent 0178f3e commit 23b5cc2
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/regulator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 23b5cc2

Please sign in to comment.