mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 08:46:46 +00:00
Merge remote-tracking branch 'regulator/topic/bypass' into regulator-next
This commit is contained in:
commit
75941a1ba3
1 changed files with 14 additions and 0 deletions
|
@ -3116,6 +3116,20 @@ EXPORT_SYMBOL_GPL(regulator_sync_voltage);
|
||||||
static int _regulator_get_voltage(struct regulator_dev *rdev)
|
static int _regulator_get_voltage(struct regulator_dev *rdev)
|
||||||
{
|
{
|
||||||
int sel, ret;
|
int sel, ret;
|
||||||
|
bool bypassed;
|
||||||
|
|
||||||
|
if (rdev->desc->ops->get_bypass) {
|
||||||
|
ret = rdev->desc->ops->get_bypass(rdev, &bypassed);
|
||||||
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
if (bypassed) {
|
||||||
|
/* if bypassed the regulator must have a supply */
|
||||||
|
if (!rdev->supply)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
return _regulator_get_voltage(rdev->supply->rdev);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (rdev->desc->ops->get_voltage_sel) {
|
if (rdev->desc->ops->get_voltage_sel) {
|
||||||
sel = rdev->desc->ops->get_voltage_sel(rdev);
|
sel = rdev->desc->ops->get_voltage_sel(rdev);
|
||||||
|
|
Loading…
Reference in a new issue