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
/
tps6586x.c
diff --git
a/drivers/mfd/tps6586x.c
b/drivers/mfd/tps6586x.c
index
bba26d9
..
a5ddf31
100644
(file)
--- a/
drivers/mfd/tps6586x.c
+++ b/
drivers/mfd/tps6586x.c
@@
-197,7
+197,7
@@
int tps6586x_set_bits(struct device *dev, int reg, uint8_t bit_mask)
if (ret)
goto out;
- if ((reg_val & bit_mask)
== 0
) {
+ if ((reg_val & bit_mask)
!= bit_mask
) {
reg_val |= bit_mask;
ret = __tps6586x_write(to_i2c_client(dev), reg, reg_val);
}