| commit | 7e9e801f746cfc66c0666e6cffa7479eebeab171 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Sun Nov 24 14:02:47 2013 +0000 |
| committer | Mark Brown <broonie@linaro.org> | Sun Nov 24 14:02:47 2013 +0000 |
| tree | c3966d5b4978a8cecf6ebfb673683563eb640b63 | |
| parent | c3fda066ded5513d1ccdbdbb449323c0ec669aa1 [diff] | |
| parent | f446043f1aa74c2d699db48ba4a7a075b88dc14d [diff] |
Merge remote-tracking branch 'regulator/fix/fixed' into regulator-linus
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 6382f0a..3fe1313 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c
@@ -2184,6 +2184,9 @@ struct regulator_ops *ops = rdev->desc->ops; int ret; + if (rdev->desc->fixed_uV && rdev->desc->n_voltages == 1 && !selector) + return rdev->desc->fixed_uV; + if (!ops->list_voltage || selector >= rdev->desc->n_voltages) return -EINVAL;