diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-17 10:45:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-17 10:45:39 -0800 |
| commit | e77a20e8ef6784586cfd66f4346af88ddb11173f (patch) | |
| tree | d06fdebc42495d670d84fdb30d0e721ceb371617 /drivers/mfd/da903x.c | |
| parent | 9753b12767a7d3d2f2d36850ce5aaae59afbd685 (diff) | |
| parent | 898d8054ec0cb5ba0ec1b15c78042a23ed103c02 (diff) | |
Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd
* 'for-linus' of git://git.o-hand.com/linux-mfd:
mfd: Correct WM8350 I2C return code usage
mfd: fix event masking for da9030
Diffstat (limited to 'drivers/mfd/da903x.c')
| -rw-r--r-- | drivers/mfd/da903x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c index b57326ae464d..0b5bd85dfcec 100644 --- a/drivers/mfd/da903x.c +++ b/drivers/mfd/da903x.c @@ -267,7 +267,7 @@ static int da9030_mask_events(struct da903x_chip *chip, unsigned int events) { uint8_t v[3]; - chip->events_mask &= ~events; + chip->events_mask |= events; v[0] = (chip->events_mask & 0xff); v[1] = (chip->events_mask >> 8) & 0xff; |