git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
mfd
/
adp5520.c
diff --git
a/drivers/mfd/adp5520.c
b/drivers/mfd/adp5520.c
index
f1d8848
..
8d816cc
100644
(file)
--- a/
drivers/mfd/adp5520.c
+++ b/
drivers/mfd/adp5520.c
@@
-109,7
+109,7
@@
int adp5520_set_bits(struct device *dev, int reg, uint8_t bit_mask)
ret = __adp5520_read(chip->client, reg, ®_val);
- if (!ret && ((reg_val & bit_mask)
== 0
)) {
+ if (!ret && ((reg_val & bit_mask)
!= bit_mask
)) {
reg_val |= bit_mask;
ret = __adp5520_write(chip->client, reg, reg_val);
}