From 0f98c3dc844c4bd47fdebf0e0ca8512dacef3579 Mon Sep 17 00:00:00 2001 From: Michael Hennerich Date: Tue, 2 Aug 2011 15:41:37 -0700 Subject: [PATCH] --- yaml --- r: 262383 b: refs/heads/master c: 4fecc2088fd02ce8a6580c12822987d3c6bab9b8 h: refs/heads/master i: 262381: 04c6a2ad158eb76636d66397b4b851f43799991d 262379: a02da1f79c33a644f076473b9a7314d198c76aac 262375: 35871c09c3006b6397b0c2b18fe6dac5f9ca647f 262367: f2acfd797a54d2daa6224b2baf7583f1923bbf0d v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/ad7879.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4d52a78450bf..e5af24d76d6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a7a8fff7b8a3bc2d3528af07c9c88083250303d +refs/heads/master: 4fecc2088fd02ce8a6580c12822987d3c6bab9b8 diff --git a/trunk/drivers/input/touchscreen/ad7879.c b/trunk/drivers/input/touchscreen/ad7879.c index bc3b5187f3a3..131f9d1c921b 100644 --- a/trunk/drivers/input/touchscreen/ad7879.c +++ b/trunk/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); }