diff options
| author | Bengt Jonsson <bengt.g.jonsson@stericsson.com> | 2010-11-10 11:06:22 +0100 |
|---|---|---|
| committer | Niket Sirsi <nsirsi@nvidia.com> | 2011-05-23 16:55:31 -0700 |
| commit | 1bbeff1c53f90475f79c7078ce65e2d4e1fac2ee (patch) | |
| tree | 0f28d85a8eaefbedca3055dbf32dccd094c63d63 /drivers/regulator | |
| parent | 0b65583b74bea08d183a5c13f6ecc8336583d550 (diff) | |
regulator: enable supply regulator only when use count is zero
Supply regulators are disabled only when the last
reference count is removed on the child regulator
(the use count goes from 1 to 0). This patch changes
the behaviour of enable so the supply regulator is
enabled only when the use count of the child
regulator goes from 0 to 1.
Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Reviewed-on: http://git.kernel.org/?p=linux/kernel/git/torvalds/
linux-2.6.git;a=commit;h=acaf6ffefdf65188071f88664435b86651d70e7c
Change-Id: I145643ad26a461e63f4bf2cb21bda6b05425c5a2
Reviewed-on: http://git-master/r/30953
Tested-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/core.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 347b4be5c898..4a93e8cc0bf1 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1264,13 +1264,17 @@ static int _regulator_enable(struct regulator_dev *rdev) { int ret, delay; - /* do we need to enable the supply regulator first */ - if (rdev->supply) { - ret = _regulator_enable(rdev->supply); - if (ret < 0) { - printk(KERN_ERR "%s: failed to enable %s: %d\n", - __func__, rdev_get_name(rdev), ret); - return ret; + if (rdev->use_count == 0) { + /* do we need to enable the supply regulator first */ + if (rdev->supply) { + mutex_lock(&rdev->supply->mutex); + ret = _regulator_enable(rdev->supply); + mutex_unlock(&rdev->supply->mutex); + if (ret < 0) { + printk(KERN_ERR "%s: failed to enable %s: %d\n", + __func__, rdev_get_name(rdev), ret); + return ret; + } } } |