Skip to content

Commit

Permalink
regulator: pv88090: logical vs bitwise AND typo
Browse files Browse the repository at this point in the history
These were supposed to be bitwise AND instead of logical.  Also kernel
style is for the operator to be on the first line and I removed some
extra parenthesis.

Fixes: c90456e ('regulator: pv88090: new regulator driver')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Dan Carpenter authored and Mark Brown committed Dec 12, 2015
1 parent ecee988 commit d761c90
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/regulator/pv88090-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -392,17 +392,17 @@ static int pv88090_i2c_probe(struct i2c_client *i2c,
if (ret < 0)
return ret;

conf2 = ((conf2 >> PV88090_BUCK_VDAC_RANGE_SHIFT)
&& PV88090_BUCK_VDAC_RANGE_MASK);
conf2 = (conf2 >> PV88090_BUCK_VDAC_RANGE_SHIFT) &
PV88090_BUCK_VDAC_RANGE_MASK;

ret = regmap_read(chip->regmap,
PV88090_REG_BUCK_FOLD_RANGE, &range);
if (ret < 0)
return ret;

range = ((range
>> (PV88080_BUCK_VRANGE_GAIN_SHIFT + i - 1))
&& PV88080_BUCK_VRANGE_GAIN_MASK);
range = (range >>
(PV88080_BUCK_VRANGE_GAIN_SHIFT + i - 1)) &
PV88080_BUCK_VRANGE_GAIN_MASK;
index = ((range << 1) | conf2);

pv88090_regulator_info[i].desc.min_uV
Expand Down

0 comments on commit d761c90

Please sign in to comment.