---

yaml --- r: 282201 b: refs/heads/master c: b2296bd h: refs/heads/master i: 282199: 2367972 v: v3
git-mirror · Jan 2, 2012 · 058e990 · 058e990
1 parent dd584a3
commit 058e990
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fef21eaacb9d739f0120c930c78dac4f6875b9f
+refs/heads/master: b2296bd43e781976743354c668a356b0df98e1da
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
@@ -2802,6 +2802,14 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
 		ret = set_supply(rdev, r);
 		if (ret < 0)
 			goto scrub;
+
+		/* Enable supply if rail is enabled */
+		if (rdev->desc->ops->is_enabled &&
+				rdev->desc->ops->is_enabled(rdev)) {
+			ret = regulator_enable(rdev->supply);
+			if (ret < 0)
+				goto scrub;
+		}
 	}
 
 	/* add consumers devices */