diff options
author | Axel Lin <axel.lin@gmail.com> | 2012-03-02 05:07:21 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-05 07:28:58 -0500 |
commit | 4adf9beda58364497889c06c1badf129a71d48be (patch) | |
tree | 607295609476befaa050114e695b912e8b651ac5 /drivers/regulator/da9052-regulator.c | |
parent | 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff) |
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: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/da9052-regulator.c')
-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) |