---

yaml --- r: 343120 b: refs/heads/master c: 86a1450 h: refs/heads/master v: v3
git-mirror · Nov 28, 2012 · 30efbf5 · 30efbf5
1 parent 89166df
commit 30efbf5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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