lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2012-03-06 08:23:30 -08:00
parent 5756b76e4d 4adf9beda5
commit 1de9d143e5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/regulator/da9052-regulator.c
View File

@@ -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 * the LDO activate bit to implment the changes on the
* LDO output. * LDO output.
*/ */
return da9052_reg_update(regulator->da9052, DA9052_SUPPLY_REG, 0, return da9052_reg_update(regulator->da9052, DA9052_SUPPLY_REG,
info->activate_bit); info->activate_bit, info->activate_bit);
} }
static int da9052_set_dcdc_voltage(struct regulator_dev *rdev, 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 * the DCDC activate bit to implment the changes on the
* DCDC output. * DCDC output.
*/ */
return da9052_reg_update(regulator->da9052, DA9052_SUPPLY_REG, 0, return da9052_reg_update(regulator->da9052, DA9052_SUPPLY_REG,
info->activate_bit); info->activate_bit, info->activate_bit);
} }
static int da9052_get_regulator_voltage_sel(struct regulator_dev *rdev) static int da9052_get_regulator_voltage_sel(struct regulator_dev *rdev)