From f71bf52808e7089a5a6df9b32ffa13e93e51f1ca Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 26 Mar 2013 16:13:14 +0800 Subject: [PATCH] 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 Acked-by: Bengt Jonsson Signed-off-by: Mark Brown --- drivers/regulator/ab8500.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 12e2740..4a70323 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; -- 2.7.4