Merge remote-tracking branch 'regulator/fix/wm831x' into regulator-next

d9f16b6e · Mark Brown · 9489e9dc · 13ae633c · d9f16b6e
Commit d9f16b6e authored Dec 10, 2012 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/regulator/wm831x-dcdc.c drivers/regulator/wm831x-dcdc.c +1 -1

No files found.
--- 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