| commit | 7cac646816c184f35640f69fe936b57403dc5d00 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Dec 10 12:42:51 2012 +0900 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Dec 10 12:42:51 2012 +0900 |
| tree | 6191757d7876ec60df5c59ffeb7bc8dedc07eaf7 | |
| parent | d9f16b6e155682a2880dc6811aa270c5447d8d74 [diff] | |
| parent | 9507281855080081084ed8526cfe1353c37407c4 [diff] |
Merge remote-tracking branch 'regulator/topic/arizona' into regulator-next
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c index 782c228..416fe0a 100644 --- a/drivers/regulator/wm831x-dcdc.c +++ b/drivers/regulator/wm831x-dcdc.c
@@ -290,7 +290,7 @@ 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