diff --git a/[refs] b/[refs]
index 895300b657f1..4d07b43f6c45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d87b969d15a084503870da598c97278fb4877753
+refs/heads/master: 55c1d7c60d9b269551cd7cc31e6be8323e1d94ec
diff --git a/trunk/drivers/regulator/da903x.c b/trunk/drivers/regulator/da903x.c
index c9de73098470..aa224d936e0d 100644
--- a/trunk/drivers/regulator/da903x.c
+++ b/trunk/drivers/regulator/da903x.c
@@ -301,7 +301,7 @@ static int da9034_set_ldo12_voltage(struct regulator_dev *rdev,
 	}
 
 	val = (min_uV - info->min_uV + info->step_uV - 1) / info->step_uV;
-	val = (val > 7 && val < 20) ? 8 : val - 12;
+	val = (val >= 20) ? val - 12 : ((val > 7) ? 8 : val);
 	val <<= info->vol_shift;
 	mask = ((1 << info->vol_nbits) - 1)  << info->vol_shift;