diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-06 11:23:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-06 11:23:30 -0500 |
| commit | 1de9d143e595aea74887c531deef8d7762ae2399 (patch) | |
| tree | 350d02164ffc9b58702519783e58d29daab1660c /drivers | |
| parent | 5756b76e4db643d8f75174a9a50038523d4b9e32 (diff) | |
| parent | 4adf9beda58364497889c06c1badf129a71d48be (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/da9052-regulator.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/regulator/da9052-regulator.c b/drivers/regulator/da9052-regulator.c index 3767364452fd..ea4d8f575ac6 100644 --- a/drivers/regulator/da9052-regulator.c +++ b/drivers/regulator/da9052-regulator.c | |||
| @@ -260,8 +260,8 @@ static int da9052_set_ldo5_6_voltage(struct regulator_dev *rdev, | |||
| 260 | * the LDO activate bit to implment the changes on the | 260 | * the LDO activate bit to implment the changes on the |
| 261 | * LDO output. | 261 | * LDO output. |
| 262 | */ | 262 | */ |
| 263 | return da9052_reg_update(regulator->da9052, DA9052_SUPPLY_REG, 0, | 263 | return da9052_reg_update(regulator->da9052, DA9052_SUPPLY_REG, |
| 264 | info->activate_bit); | 264 | info->activate_bit, info->activate_bit); |
| 265 | } | 265 | } |
| 266 | 266 | ||
| 267 | static int da9052_set_dcdc_voltage(struct regulator_dev *rdev, | 267 | static int da9052_set_dcdc_voltage(struct regulator_dev *rdev, |
| @@ -280,8 +280,8 @@ static int da9052_set_dcdc_voltage(struct regulator_dev *rdev, | |||
| 280 | * the DCDC activate bit to implment the changes on the | 280 | * the DCDC activate bit to implment the changes on the |
| 281 | * DCDC output. | 281 | * DCDC output. |
| 282 | */ | 282 | */ |
| 283 | return da9052_reg_update(regulator->da9052, DA9052_SUPPLY_REG, 0, | 283 | return da9052_reg_update(regulator->da9052, DA9052_SUPPLY_REG, |
| 284 | info->activate_bit); | 284 | info->activate_bit, info->activate_bit); |
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | static int da9052_get_regulator_voltage_sel(struct regulator_dev *rdev) | 287 | static int da9052_get_regulator_voltage_sel(struct regulator_dev *rdev) |