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

Commit 1de9d143 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator 

Pull regulator updates from Mark Brown:
 "A simple fix that's obvious from inspection.  There's no mainline
  users of this driver yet (there's some i.MX platforms which will use
  it)."

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Fix mask parameter in da9052_reg_update calls
parents 5756b76e 4adf9bed

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)