---

yaml --- r: 262383 b: refs/heads/master c: 4fecc20 h: refs/heads/master i: 262381: 04c6a2a 262379: a02da1f 262375: 35871c0 262367: f2acfd7 v: v3
git-mirror · Aug 3, 2011 · 0f98c3d · 0f98c3d
1 parent a57733a
commit 0f98c3d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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);
 }