Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / mfd / jz4740-adc.c

diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index 3ad492cb6c4158b9160e3a2fefc7fb6423086ba5..9dd1b33f227512ffc6cb2e833a2d721cf5a1bf6e 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);