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

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

regulator: Fix mask parameter in da9052_reg_update calls 



If the mask parameter is 0, info->activate_bit bit won't be set by
calling da9052_reg_update.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 192cfd58

drivers/regulator/da9052-regulator.c

+4 −4
Original line number Diff line number Diff line
@@ -260,8 +260,8 @@ static int da9052_set_ldo5_6_voltage(struct regulator_dev *rdev, 
	 * the LDO activate bit to implment the changes on the

	 * LDO output.

	*/

	return da9052_reg_update(regulator->da9052, DA9052_SUPPLY_REG, 0,

				 info->activate_bit);

	return da9052_reg_update(regulator->da9052, DA9052_SUPPLY_REG,

				 info->activate_bit, info->activate_bit);

}



static int da9052_set_dcdc_voltage(struct regulator_dev *rdev,
@@ -280,8 +280,8 @@ static int da9052_set_dcdc_voltage(struct regulator_dev *rdev, 
	 * the DCDC activate bit to implment the changes on the

	 * DCDC output.

	*/

	return da9052_reg_update(regulator->da9052, DA9052_SUPPLY_REG, 0,

				 info->activate_bit);

	return da9052_reg_update(regulator->da9052, DA9052_SUPPLY_REG,

				 info->activate_bit, info->activate_bit);

}



static int da9052_get_regulator_voltage_sel(struct regulator_dev *rdev)