Merge remote-tracking branch 'regulator/topic/da9052' into regulator-next

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/regulator/da9052-regulator.c b/drivers/regulator/da9052-regulator.c
index 27355b1199e5..0a2586a39e6a 100644
--- a/drivers/regulator/da9052-regulator.c
+++ b/drivers/regulator/da9052-regulator.c
@@ -129,17 +129,17 @@ static int da9052_dcdc_set_current_limit(struct regulator_dev *rdev, int min_uA,
         else if (offset == 0)
                 row = 1;
 
-        if (min_uA > da9052_current_limits[row][DA9052_MAX_UA] ||
-            max_uA < da9052_current_limits[row][DA9052_MIN_UA])
-                return -EINVAL;
-
         for (i = DA9052_CURRENT_RANGE - 1; i >= 0; i--) {
-                if (da9052_current_limits[row][i] <= max_uA) {
+                if ((min_uA <= da9052_current_limits[row][i]) &&
+                    (da9052_current_limits[row][i] <= max_uA)) {
                         reg_val = i;
                         break;
                 }
         }
 
+        if (i < 0)
+                return -EINVAL;
+
         /* Determine the even or odd position of the buck current limit
          * register field
         */