This avoid setting is_enabled flag to wrong status if enable/disable fails.
Signed-off-by: Axel Lin <[email protected]> --- drivers/regulator/ab8500.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 12e2740..5e7e84b 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -121,7 +121,8 @@ static int ab8500_regulator_enable(struct regulator_dev *rdev) dev_err(rdev_get_dev(rdev), "couldn't set enable bits for regulator\n"); - info->is_enabled = true; + if (ret == 0) + info->is_enabled = true; dev_vdbg(rdev_get_dev(rdev), "%s-enable (bank, reg, mask, value): 0x%x, 0x%x, 0x%x, 0x%x\n", @@ -148,7 +149,8 @@ static int ab8500_regulator_disable(struct regulator_dev *rdev) dev_err(rdev_get_dev(rdev), "couldn't set disable bits for regulator\n"); - info->is_enabled = false; + if (ret == 0) + info->is_enabled = false; dev_vdbg(rdev_get_dev(rdev), "%s-disable (bank, reg, mask, value): 0x%x, 0x%x, 0x%x, 0x%x\n", -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
