aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/regulator/lp872x.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/regulator/lp872x.c b/drivers/regulator/lp872x.c
index 212c38eaba70..6199d0f6cca1 100644
--- a/drivers/regulator/lp872x.c
+++ b/drivers/regulator/lp872x.c
@@ -374,8 +374,8 @@ static int lp8725_buck_set_current_limit(struct regulator_dev *rdev,
374{ 374{
375 struct lp872x *lp = rdev_get_drvdata(rdev); 375 struct lp872x *lp = rdev_get_drvdata(rdev);
376 enum lp872x_regulator_id buck = rdev_get_id(rdev); 376 enum lp872x_regulator_id buck = rdev_get_id(rdev);
377 int i, max = ARRAY_SIZE(lp8725_buck_uA); 377 int i;
378 u8 addr, val; 378 u8 addr;
379 379
380 switch (buck) { 380 switch (buck) {
381 case LP8725_ID_BUCK1: 381 case LP8725_ID_BUCK1:
@@ -388,17 +388,15 @@ static int lp8725_buck_set_current_limit(struct regulator_dev *rdev,
388 return -EINVAL; 388 return -EINVAL;
389 } 389 }
390 390
391 for (i = 0 ; i < max ; i++) 391 for (i = ARRAY_SIZE(lp8725_buck_uA) - 1 ; i >= 0; i--) {
392 if (lp8725_buck_uA[i] >= min_uA && 392 if (lp8725_buck_uA[i] >= min_uA &&
393 lp8725_buck_uA[i] <= max_uA) 393 lp8725_buck_uA[i] <= max_uA)
394 break; 394 return lp872x_update_bits(lp, addr,
395 395 LP8725_BUCK_CL_M,
396 if (i == max) 396 i << LP8725_BUCK_CL_S);
397 return -EINVAL; 397 }
398
399 val = i << LP8725_BUCK_CL_S;
400 398
401 return lp872x_update_bits(lp, addr, LP8725_BUCK_CL_M, val); 399 return -EINVAL;
402} 400}
403 401
404static int lp8725_buck_get_current_limit(struct regulator_dev *rdev) 402static int lp8725_buck_get_current_limit(struct regulator_dev *rdev)