git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'regulator/fix/da9211', 'regulator/fix/ltc3589' and...
[sfrench/cifs-2.6.git]
/
drivers
/
regulator
/
da9211-regulator.c
diff --git
a/drivers/regulator/da9211-regulator.c
b/drivers/regulator/da9211-regulator.c
index 1482adafa1ad43eafa970c53b671b264c1e1a572..05f879a5d24e704f71e1d12820aada5d78a5d317 100644
(file)
--- a/
drivers/regulator/da9211-regulator.c
+++ b/
drivers/regulator/da9211-regulator.c
@@
-282,7
+282,7
@@
static int da9211_regulator_init(struct da9211 *chip)
if (chip->chip_irq != 0) {
ret = regmap_update_bits(chip->regmap,
- DA9211_REG_MASK_B, DA9211_M_OV_CURR_A << i,
1
);
+ DA9211_REG_MASK_B, DA9211_M_OV_CURR_A << i,
0
);
if (ret < 0) {
dev_err(chip->dev,
"Failed to update mask reg: %d\n", ret);