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

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

regulator: ab8500-ext: Don't update info->is_enabled if write to register 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 1ec990c0

drivers/regulator/ab8500-ext.c

+6 −2
Original line number Diff line number Diff line
@@ -72,9 +72,11 @@ static int enable(struct ab8500_ext_regulator_info *info, u8 *regval) 
	ret = abx500_mask_and_set_register_interruptible(info->dev,

		info->update_bank, info->update_reg,

		info->update_mask, *regval);

	if (ret < 0)

	if (ret < 0) {

		dev_err(rdev_get_dev(info->rdev),

			"couldn't set enable bits for regulator\n");

		return ret;

	}



	info->is_enabled = true;
@@ -117,9 +119,11 @@ static int disable(struct ab8500_ext_regulator_info *info, u8 *regval) 
	ret = abx500_mask_and_set_register_interruptible(info->dev,

		info->update_bank, info->update_reg,

		info->update_mask, *regval);

	if (ret < 0)

	if (ret < 0) {

		dev_err(rdev_get_dev(info->rdev),

			"couldn't set disable bits for regulator\n");

		return ret;

	}



	info->is_enabled = false;