aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-10-07 15:51:20 +0800
committerSamuel Ortiz <sameo@linux.intel.com>2010-10-29 00:30:20 +0200
commitf9c28019d44a97272ef0f382e8d0d1a85dd1cf3e (patch)
treedfac42fe428ca6fab6a5ff7dbfd8713150127dde /drivers/mfd
parentmfd: Add TPS658621C device ID (diff)
downloadlinux-dev-f9c28019d44a97272ef0f382e8d0d1a85dd1cf3e.tar.xz
linux-dev-f9c28019d44a97272ef0f382e8d0d1a85dd1cf3e.zip
mfd: Fix jz4740_adc_set_enabled
When enabled is false, clear BIT(engine) of JZ_REG_ADC_ENABLE register. Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/jz4740-adc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index 3ad492cb6c41..9dd1b33f2275 100644
--- 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);