git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
mfd
/
jz4740-adc.c
diff --git
a/drivers/mfd/jz4740-adc.c
b/drivers/mfd/jz4740-adc.c
index
3ad492c
..
9dd1b33
100644
(file)
--- a/
drivers/mfd/jz4740-adc.c
+++ b/
drivers/mfd/jz4740-adc.c
@@
-153,7
+153,7
@@
static inline void jz4740_adc_set_enabled(struct jz4740_adc *adc, int engine,
if (enabled)
val |= BIT(engine);
else
- val &= BIT(engine);
+ val &=
~
BIT(engine);
writeb(val, adc->base + JZ_REG_ADC_ENABLE);
spin_unlock_irqrestore(&adc->lock, flags);