---

yaml --- r: 365125 b: refs/heads/master c: 0f7b87f h: refs/heads/master i: 365123: 3d24182 v: v3
git-mirror · Apr 5, 2013 · c20f7c2 · c20f7c2
1 parent 90e7132
commit c20f7c2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 167d41dce7633b70aae4175fdec734e1cdd3a190
+refs/heads/master: 0f7b87f0acc04e4f22ec5d3f2283a80993ca3aa8
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
@@ -3477,7 +3477,14 @@ regulator_register(const struct regulator_desc *regulator_desc,
 
 		r = regulator_dev_lookup(dev, supply, &ret);
 
-		if (!r) {
+		if (ret == -ENODEV) {
+			/*
+			 * No supply was specified for this regulator and
+			 * there will never be one.
+			 */
+			ret = 0;
+			goto add_dev;
+		} else if (!r) {
 			dev_err(dev, "Failed to find supply %s\n", supply);
 			ret = -EPROBE_DEFER;
 			goto scrub;
@@ -3495,6 +3502,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
 		}
 	}
 
+add_dev:
 	/* add consumers devices */
 	if (init_data) {
 		for (i = 0; i < init_data->num_consumer_supplies; i++) {