diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 07:42:50 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 07:42:50 +0400 |
| commit | d9f16b6e155682a2880dc6811aa270c5447d8d74 (patch) | |
| tree | bffbe4e32839987f02fe55b86f774de21b8c2dcc /drivers/regulator | |
| parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
| parent | 13ae633cf729b0ecb677b75b04886ff8fada8fad (diff) | |
| download | linux-d9f16b6e155682a2880dc6811aa270c5447d8d74.tar.xz | |
Merge remote-tracking branch 'regulator/fix/wm831x' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/wm831x-dcdc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c index 782c228a19bd..416fe0a37f56 100644 --- a/drivers/regulator/wm831x-dcdc.c +++ b/drivers/regulator/wm831x-dcdc.c @@ -290,7 +290,7 @@ static int wm831x_buckv_set_voltage_sel(struct regulator_dev *rdev, if (vsel > dcdc->dvs_vsel) { ret = wm831x_set_bits(wm831x, dvs_reg, WM831X_DC1_DVS_VSEL_MASK, - dcdc->dvs_vsel); + vsel); if (ret == 0) dcdc->dvs_vsel = vsel; else |