From: Axel Lin <axel.lin@ingics.com>
Date: Tue, 26 Mar 2013 08:13:14 +0000 (+0800)
Subject: regulator: ab8500: Don't update is_enabled flag in error paths
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f71bf52808e7089a5a6df9b32ffa13e93e51f1ca;p=openwrt%2Fstaging%2Fblogic.git

regulator: ab8500: Don't update is_enabled flag in error paths

This avoid setting is_enabled flag to wrong status if enable/disable fails.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 12e274039ae1..4a70323377d3 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -117,9 +117,11 @@ static int ab8500_regulator_enable(struct regulator_dev *rdev)
 	ret = abx500_mask_and_set_register_interruptible(info->dev,
 		info->update_bank, info->update_reg,
 		info->update_mask, info->update_val);
-	if (ret < 0)
+	if (ret < 0) {
 		dev_err(rdev_get_dev(rdev),
 			"couldn't set enable bits for regulator\n");
+		return ret;
+	}
 
 	info->is_enabled = true;
 
@@ -144,9 +146,11 @@ static int ab8500_regulator_disable(struct regulator_dev *rdev)
 	ret = abx500_mask_and_set_register_interruptible(info->dev,
 		info->update_bank, info->update_reg,
 		info->update_mask, 0x0);
-	if (ret < 0)
+	if (ret < 0) {
 		dev_err(rdev_get_dev(rdev),
 			"couldn't set disable bits for regulator\n");
+		return ret;
+	}
 
 	info->is_enabled = false;