openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Mark Brown 2012-12-10 12:42:50 +09:00
parent 9489e9dcae 13ae633cf7
commit d9f16b6e15
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/regulator/wm831x-dcdc.c
View File

@ -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