diff mbox

input: touchscreen: ad7879: Fix deficient device disable

Message ID 1312289205-9936-1-git-send-email-michael.hennerich@analog.com (mailing list archive)
State Accepted
Commit 4fecc2088fd02ce8a6580c12822987d3c6bab9b8
Headers show

Commit Message

Hennerich, Michael Aug. 2, 2011, 12:46 p.m. UTC 
From: Michael Hennerich <michael.hennerich@analog.com>

Input close or device disable should not interact with the exported gpiolib
functionality. However that's the case. __ad7879_disable() clears the
entire AD7879_REG_CTRL2, while it should just power down the ADC and
its reference.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
---
 drivers/input/touchscreen/ad7879.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Comments

Dmitry Torokhov Aug. 3, 2011, 5:20 a.m. UTC | #1 
On Tue, Aug 02, 2011 at 02:46:45PM +0200, michael.hennerich@analog.com wrote:
> From: Michael Hennerich <michael.hennerich@analog.com>
> 
> Input close or device disable should not interact with the exported gpiolib
> functionality. However that's the case. __ad7879_disable() clears the
> entire AD7879_REG_CTRL2, while it should just power down the ADC and
> its reference.
> 
> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>

Applied, thanks Michael.
diff mbox

Patch

diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c
index bc3b518..131f9d1 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -249,12 +249,14 @@  static void __ad7879_enable(struct ad7879 *ts)
 
 static void __ad7879_disable(struct ad7879 *ts)
 {
+	u16 reg = (ts->cmd_crtl2 & ~AD7879_PM(-1)) |
+		AD7879_PM(AD7879_PM_SHUTDOWN);
 	disable_irq(ts->irq);
 
 	if (del_timer_sync(&ts->timer))
 		ad7879_ts_event_release(ts);
 
-	ad7879_write(ts, AD7879_REG_CTRL2, AD7879_PM(AD7879_PM_SHUTDOWN));
+	ad7879_write(ts, AD7879_REG_CTRL2, reg);
 }