---

yaml --- r: 222782 b: refs/heads/master c: 7727da2 h: refs/heads/master v: v3
git-mirror · Nov 30, 2010 · 2d50b71 · 2d50b71
1 parent ade798a
commit 2d50b71
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e36c1df8e18183ba2c691fe766a52c94020cdc5e
+refs/heads/master: 7727da22e820a96ab394db2fc0ab58f7f7ecb323
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
@@ -2348,6 +2348,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
 	if (init_data->supply_regulator && init_data->supply_regulator_dev) {
 		dev_err(dev,
 			"Supply regulator specified by both name and dev\n");
+		ret = -EINVAL;
 		goto scrub;
 	}
 
@@ -2366,6 +2367,7 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
 		if (!found) {
 			dev_err(dev, "Failed to find supply %s\n",
 				init_data->supply_regulator);
+			ret = -ENODEV;
 			goto scrub;
 		}