Commit acaf6ffe authored by Bengt Jonsson's avatar Bengt Jonsson Committed by Liam Girdwood

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: default avatarBengt Jonsson <bengt.g.jonsson@stericsson.com>
Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 02fa3ec0
...@@ -1273,15 +1273,17 @@ static int _regulator_enable(struct regulator_dev *rdev) ...@@ -1273,15 +1273,17 @@ static int _regulator_enable(struct regulator_dev *rdev)
{ {
int ret, delay; int ret, delay;
/* do we need to enable the supply regulator first */ if (rdev->use_count == 0) {
if (rdev->supply) { /* do we need to enable the supply regulator first */
mutex_lock(&rdev->supply->mutex); if (rdev->supply) {
ret = _regulator_enable(rdev->supply); mutex_lock(&rdev->supply->mutex);
mutex_unlock(&rdev->supply->mutex); ret = _regulator_enable(rdev->supply);
if (ret < 0) { mutex_unlock(&rdev->supply->mutex);
printk(KERN_ERR "%s: failed to enable %s: %d\n", if (ret < 0) {
__func__, rdev_get_name(rdev), ret); printk(KERN_ERR "%s: failed to enable %s: %d\n",
return ret; __func__, rdev_get_name(rdev), ret);
return ret;
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment