Commit 63cee946 authored by Mattias Wallin's avatar Mattias Wallin Committed by Liam Girdwood

regulator: lock supply in regulator enable

This patch add locks around regulator supply enable.
Signed-off-by: default avatarMattias Wallin <mattias.wallin@stericsson.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 4162cf64
...@@ -1267,17 +1267,15 @@ static int _regulator_enable(struct regulator_dev *rdev) ...@@ -1267,17 +1267,15 @@ static int _regulator_enable(struct regulator_dev *rdev)
{ {
int ret, delay; int ret, delay;
if (rdev->use_count == 0) { /* do we need to enable the supply regulator first */
/* do we need to enable the supply regulator first */ if (rdev->supply) {
if (rdev->supply) { mutex_lock(&rdev->supply->mutex);
mutex_lock(&rdev->supply->mutex); ret = _regulator_enable(rdev->supply);
ret = _regulator_enable(rdev->supply); mutex_unlock(&rdev->supply->mutex);
mutex_unlock(&rdev->supply->mutex); if (ret < 0) {
if (ret < 0) { printk(KERN_ERR "%s: failed to enable %s: %d\n",
printk(KERN_ERR "%s: failed to enable %s: %d\n", __func__, rdev_get_name(rdev), ret);
__func__, rdev_get_name(rdev), ret); return 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