mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-19 09:04:57 +00:00
regulator: lock supply in regulator enable
This patch add locks around regulator supply enable. Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
This commit is contained in:
parent
4162cf6497
commit
63cee94614
1 changed files with 9 additions and 11 deletions
|
@ -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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue