diff --git a/[refs] b/[refs]
index 3d05937a7ffb..ac4b2b28d300 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0178f3e28e2166664916265c5d4922b1376b9fa1
+refs/heads/master: 23b5cc2ab6783256cf06779e1d522482b819b808
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index eb112d961515..2a3494f72465 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/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;