From ab8fe0ad145ea1a5d8e3812dd3e4ed308684420c Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 7 Oct 2010 15:51:20 +0800 Subject: [PATCH] --- yaml --- r: 220629 b: refs/heads/master c: f9c28019d44a97272ef0f382e8d0d1a85dd1cf3e h: refs/heads/master i: 220627: 41a7bf5c1380ec3b9cd37b427772213d3d799522 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/jz4740-adc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 39afa5c2f537..7042b41c434a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1f92f05754116fc65cb1165d4942d25df6f200e +refs/heads/master: f9c28019d44a97272ef0f382e8d0d1a85dd1cf3e diff --git a/trunk/drivers/mfd/jz4740-adc.c b/trunk/drivers/mfd/jz4740-adc.c index 3ad492cb6c41..9dd1b33f2275 100644 --- a/trunk/drivers/mfd/jz4740-adc.c +++ b/trunk/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);