summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2014-02-18 11:41:05 +0100
committerMark Brown <broonie@linaro.org>2014-02-19 17:31:47 +0100
commit8a7963d55b58aa95f45928dec229380c28d921ed (patch)
treed01592163e7e89db1302799f59ccd7210c891718
parentregulator: da9063: Add missing of_node_put (diff)
downloadlinux-8a7963d55b58aa95f45928dec229380c28d921ed.tar.xz
linux-8a7963d55b58aa95f45928dec229380c28d921ed.zip
regulator: da9063: Do not hardcode return values
Propagate the error values returned by the function instead. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
-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)
sel = regulator_map_voltage_linear(rdev, uV, uV);
if (sel < 0)
- return -EINVAL;
+ return sel;
sel <<= ffs(rdev->desc->vsel_mask) - 1;
@@ -755,7 +755,7 @@ static int da9063_regulator_probe(struct platform_device *pdev)
if (ret < 0) {
dev_err(&pdev->dev,
"Error while reading BUCKs configuration\n");
- return -EIO;
+ return ret;
}
bcores_merged = val & DA9063_BCORE_MERGE;
bmem_bio_merged = val & DA9063_BUCK_MERGE;