diff --git a/[refs] b/[refs] index 45f9de0beea6..ea204373d6a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61663171bea0ccb499f0818234c5be7ea6c4c791 +refs/heads/master: 0bdc81e4e944781a2bcc971f9e3cf24ac7030939 diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c index 7584a74eec8a..09a737c868b5 100644 --- a/trunk/drivers/regulator/core.c +++ b/trunk/drivers/regulator/core.c @@ -2050,6 +2050,9 @@ int regulator_map_voltage_linear(struct regulator_dev *rdev, return -EINVAL; } + if (min_uV < rdev->desc->min_uV) + min_uV = rdev->desc->min_uV; + ret = DIV_ROUND_UP(min_uV - rdev->desc->min_uV, rdev->desc->uV_step); if (ret < 0) return ret;