git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.28-rc9' into x86/apic
[sfrench/cifs-2.6.git]
/
drivers
/
mfd
/
da903x.c
diff --git
a/drivers/mfd/da903x.c
b/drivers/mfd/da903x.c
index b57326ae464d4f91f83fce55e412d12f5712effa..0b5bd85dfcec5e4d4bdabfeae15a4a19f19f28ed 100644
(file)
--- 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;