]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
regulator: pv88090: logical vs bitwise AND typo
authorDan Carpenter <dan.carpenter@oracle.com>
Sat, 12 Dec 2015 12:38:43 +0000 (15:38 +0300)
committerMark Brown <broonie@kernel.org>
Sat, 12 Dec 2015 22:34:08 +0000 (22:34 +0000)
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>
drivers/regulator/pv88090-regulator.c

index 2513fef37409571876f3160d37c685c7add306b0..ac15f31b5fe0cc83061ef002b32b9c7aaae5dc06 100644 (file)
@@ -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