diff --git a/[refs] b/[refs] index e876b20de6f3..df288b3387c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9f16b6e155682a2880dc6811aa270c5447d8d74 +refs/heads/master: 86a14501180de78ccec1e513b031a06ea60c973f diff --git a/trunk/drivers/regulator/arizona-ldo1.c b/trunk/drivers/regulator/arizona-ldo1.c index d184aa35abcb..9d504585104a 100644 --- a/trunk/drivers/regulator/arizona-ldo1.c +++ b/trunk/drivers/regulator/arizona-ldo1.c @@ -56,6 +56,7 @@ static const struct regulator_desc arizona_ldo1 = { .min_uV = 900000, .uV_step = 50000, .n_voltages = 6, + .enable_time = 500, .owner = THIS_MODULE, }; diff --git a/trunk/drivers/regulator/wm831x-dcdc.c b/trunk/drivers/regulator/wm831x-dcdc.c index 416fe0a37f56..782c228a19bd 100644 --- a/trunk/drivers/regulator/wm831x-dcdc.c +++ b/trunk/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, - vsel); + dcdc->dvs_vsel); if (ret == 0) dcdc->dvs_vsel = vsel; else