Skip to content

Commit

Permalink
Merge remote-tracking branch 'regulator/fix/wm831x' into regulator-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Dec 10, 2012
2 parents 9489e9d + 13ae633 commit d9f16b6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/regulator/wm831x-dcdc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d9f16b6

Please sign in to comment.