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 12e274039ae1d8c2d18ffc2725ca3ad10cc0d506..4a70323377d336034c68c53d0ec1cbb92616b4d3 100644 (file)
--- 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;