Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

regulator: Use regulator_lock_supply() for get_voltage() too

Browse source 
Since we need to read voltages of parents as part of setting supply
voltages we need to be able to do get_voltage() internally without
taking locks so reorganize the locking to take locks on the full tree on
entry rather than as we recurse when called externally.

Reported-by: John Stultz <john.stultz@linaro.org>
Tested-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Mark Brown 2015-11-03 05:58:14 +00:00
parent fc42112c0e
commit d9b96d35d2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/regulator/core.c
View file

@ -3055,7 +3055,7 @@ static int _regulator_get_voltage(struct regulator_dev *rdev)
} else if (rdev->desc->fixed_uV && (rdev->desc->n_voltages == 1)) { } else if (rdev->desc->fixed_uV && (rdev->desc->n_voltages == 1)) {
ret = rdev->desc->fixed_uV; ret = rdev->desc->fixed_uV;
} else if (rdev->supply) { } else if (rdev->supply) {
ret = regulator_get_voltage(rdev->supply); ret = _regulator_get_voltage(rdev->supply->rdev);
} else { } else {
return -EINVAL; return -EINVAL;
} }
@ -3078,11 +3078,11 @@ int regulator_get_voltage(struct regulator *regulator)
{ {
int ret; int ret;
mutex_lock(&regulator->rdev->mutex); regulator_lock_supply(regulator->rdev);
ret = _regulator_get_voltage(regulator->rdev); ret = _regulator_get_voltage(regulator->rdev);
mutex_unlock(&regulator->rdev->mutex); regulator_unlock_supply(regulator->rdev);
return ret; return ret;
} }