diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-01-08 06:31:24 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-01-08 06:31:24 -0500 |
| commit | 636f0c70f2557e0819b50c74e31b4a027327015e (patch) | |
| tree | 3a259ef26659dac92782651440091b9f5ab1a7f7 /drivers/mfd/adp5520.c | |
| parent | 675eef66e3edcab8065533edfefbcbbacb9a30d3 (diff) | |
| parent | 2e885057b7f75035f0b85e02f737891482815a81 (diff) | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Diffstat (limited to 'drivers/mfd/adp5520.c')
| -rw-r--r-- | drivers/mfd/adp5520.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c index f1d88483112..8d816cce832 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) | |||
| 109 | 109 | ||
| 110 | ret = __adp5520_read(chip->client, reg, ®_val); | 110 | ret = __adp5520_read(chip->client, reg, ®_val); |
| 111 | 111 | ||
| 112 | if (!ret && ((reg_val & bit_mask) == 0)) { | 112 | if (!ret && ((reg_val & bit_mask) != bit_mask)) { |
| 113 | reg_val |= bit_mask; | 113 | reg_val |= bit_mask; |
| 114 | ret = __adp5520_write(chip->client, reg, reg_val); | 114 | ret = __adp5520_write(chip->client, reg, reg_val); |
| 115 | } | 115 | } |