Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f71bf528 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

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: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarBengt Jonsson <bengt.g.jonsson@stericsson.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 5689e830

drivers/regulator/ab8500.c

+6 −2
Original line number Diff line number Diff line
@@ -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;