summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2015-12-12 15:38:43 +0300
committerMark Brown <broonie@kernel.org>2015-12-13 01:34:08 +0300
commitd761c906179944c6000d3f0c29e00e7543b6c139 (patch)
tree9c1d6bd6947db96f01e7ee82bccb48bc0b09cc86 /drivers/regulator
parentecee988ac848fabbff6c926739a520b1748c4a79 (diff)
downloadlinux-d761c906179944c6000d3f0c29e00e7543b6c139.tar.xz
regulator: pv88090: logical vs bitwise AND typo
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: c90456e36d9c ('regulator: pv88090: new regulator driver') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/pv88090-regulator.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/regulator/pv88090-regulator.c b/drivers/regulator/pv88090-regulator.c
index 2513fef37409..ac15f31b5fe0 100644
--- a/drivers/regulator/pv88090-regulator.c
+++ b/drivers/regulator/pv88090-regulator.c
@@ -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