diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-11 21:44:53 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-11 21:44:53 +0900 |
| commit | f3cd19c38c3453d3af766979ccdde91eeb8b4d05 (patch) | |
| tree | 88e5368dcff3b7f44c6bf9630873f156a7b5f344 /drivers/regulator | |
| parent | bfd9155ebbdd4ea3d14b5d1ee933a893bbe0618f (diff) | |
| parent | 8a23b4e03d6873ec50f7d212de78ff01e393fc1a (diff) | |
Merge remote-tracking branch 'regulator/topic/change' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index cd1b201c91e2..0f65b246cc0c 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1886,7 +1886,7 @@ int regulator_can_change_voltage(struct regulator *regulator) if (rdev->constraints && rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE && - rdev->desc->n_voltages > 1) + (rdev->desc->n_voltages - rdev->desc->linear_min_sel) > 1) return 1; return 0; |