mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-09 15:39:23 +02:00
2b87facd96
* Fix concurrent battery readings * Add missing kfree in battery driver remove * Fix disabling of a ADC component git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23670 3c298f89-4303-0410-b956-a3cf2f4a3e73
26 lines
810 B
Diff
26 lines
810 B
Diff
From 1abac8c26df9112efee5da078f163b1c32075037 Mon Sep 17 00:00:00 2001
|
|
From: Axel Lin <axel.lin@gmail.com>
|
|
Date: Thu, 7 Oct 2010 15:51:20 +0800
|
|
Subject: [PATCH] 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>
|
|
---
|
|
drivers/mfd/jz4740-adc.c | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
--- a/drivers/mfd/jz4740-adc.c
|
|
+++ b/drivers/mfd/jz4740-adc.c
|
|
@@ -154,7 +154,7 @@ static inline void jz4740_adc_set_enable
|
|
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);
|