aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/regulator/da9063-regulator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c
index f5d1ca9ab7dd..3c65644f3007 100644
--- a/drivers/regulator/da9063-regulator.c
+++ b/drivers/regulator/da9063-regulator.c
@@ -363,7 +363,7 @@ static int da9063_set_suspend_voltage(struct regulator_dev *rdev, int uV)
363 363
364 sel = regulator_map_voltage_linear(rdev, uV, uV); 364 sel = regulator_map_voltage_linear(rdev, uV, uV);
365 if (sel < 0) 365 if (sel < 0)
366 return -EINVAL; 366 return sel;
367 367
368 sel <<= ffs(rdev->desc->vsel_mask) - 1; 368 sel <<= ffs(rdev->desc->vsel_mask) - 1;
369 369
@@ -755,7 +755,7 @@ static int da9063_regulator_probe(struct platform_device *pdev)
755 if (ret < 0) { 755 if (ret < 0) {
756 dev_err(&pdev->dev, 756 dev_err(&pdev->dev,
757 "Error while reading BUCKs configuration\n"); 757 "Error while reading BUCKs configuration\n");
758 return -EIO; 758 return ret;
759 } 759 }
760 bcores_merged = val & DA9063_BCORE_MERGE; 760 bcores_merged = val & DA9063_BCORE_MERGE;
761 bmem_bio_merged = val & DA9063_BUCK_MERGE; 761 bmem_bio_merged = val & DA9063_BUCK_MERGE;