aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/da903x.c
diff options
context:
space:
mode:
authorMike Rapoport <mike@compulab.co.il>2008-11-07 19:28:19 -0500
committerSamuel Ortiz <samuel@sortiz.org>2008-11-16 13:58:45 -0500
commitb1ccbdc4a2af5ffcd6082c3a7a6fbd0e134031f2 (patch)
treef571080c957cb38cbc2d18eca4c7eaece23874e5 /drivers/mfd/da903x.c
parent77fb61a04a0483ad274ce5c51b02c46c12db3693 (diff)
mfd: fix event masking for da9030
Signed-off-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Samuel Ortiz <sameo@openedhand.com>
Diffstat (limited to 'drivers/mfd/da903x.c')
-rw-r--r--drivers/mfd/da903x.c2
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)
267{ 267{
268 uint8_t v[3]; 268 uint8_t v[3];
269 269
270 chip->events_mask &= ~events; 270 chip->events_mask |= events;
271 271
272 v[0] = (chip->events_mask & 0xff); 272 v[0] = (chip->events_mask & 0xff);
273 v[1] = (chip->events_mask >> 8) & 0xff; 273 v[1] = (chip->events_mask >> 8) & 0xff;