summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-10-31 04:00:06 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2011-12-20 18:50:55 +0100
commit890c98e3746fa8705cc9c70979e64360cf2d8a31 (patch)
tree456c4a8104035dbcac651b4183ee33e17aad2a1e /drivers/mfd
parentmfd: Add missed free_irq in da903x_remove (diff)
downloadlinux-890c98e3746fa8705cc9c70979e64360cf2d8a31.tar.xz
linux-890c98e3746fa8705cc9c70979e64360cf2d8a31.zip
mfd: Set adp5520 bits if new value is different from the old one
Current code checks if all the bit_mask bits are all zero is wrong. We need to write new value if the bit mask fields of new value is not equal to old value. Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/adp5520.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c
index f1d88483112c..8d816cce8322 100644
--- 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, &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);
}