diff --git a/[refs] b/[refs] index 53a5533bc5bc..ed29837f36e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77bb8ff968dddb42a773c7b32d1a6a07f96f3f79 +refs/heads/master: 656d0498ea14c51cd8ec00081b5e0662acc72614 diff --git a/trunk/drivers/regulator/da903x.c b/trunk/drivers/regulator/da903x.c index 7d9c2506d215..c9de73098470 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 > 7 && val < 20) ? 8 : val - 12; val <<= info->vol_shift; mask = ((1 << info->vol_nbits) - 1) << info->vol_shift;