From 058e9902c02a17bcfbd9d380613f90618948c069 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Mon, 2 Jan 2012 13:08:45 +0530 Subject: [PATCH] --- yaml --- r: 282201 b: refs/heads/master c: b2296bd43e781976743354c668a356b0df98e1da h: refs/heads/master i: 282199: 2367972d889f1b1dad41cf5ff5823ff2c1589838 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/core.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 73ad4e15a0f2..4220db2507d7 100644 --- 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 index e70e15c4aa28..eb750a1ed7fe 100644 --- 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 */