From d9d666bb8ce9d46f24c66c2ec42a0bb925b513b1 Mon Sep 17 00:00:00 2001
From: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Date: Wed, 23 Jul 2008 14:38:27 -0400
Subject: [PATCH] --- yaml --- r: 106911 b: refs/heads/master c:
 9460b6529d8a0bfabf241ddda8b0e469d219844c h: refs/heads/master i:   106909:
 5db82e1f7d103ca906259b0bbad8f83cff99905b   106907:
 d0e8a8eccf5a06b70c46a02f420fe3e9e612f0bf   106903:
 ab736d462f5c1a4df6b460960a2e3f23ba0f3be5   106895:
 0c815255250877c0d586f7e38ff5a18c79601ec5   106879:
 c36e86c5c9a774546c7e7a32c36cd20b2a5db96f v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/input/touchscreen/ads7846.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 51807e1a99d7..cb2182d0d3cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 494f685775ee4c2f3db4081209f00ff0633243fc
+refs/heads/master: 9460b6529d8a0bfabf241ddda8b0e469d219844c
diff --git a/trunk/drivers/input/touchscreen/ads7846.c b/trunk/drivers/input/touchscreen/ads7846.c
index 4d060321514f..ce6f48c695f5 100644
--- a/trunk/drivers/input/touchscreen/ads7846.c
+++ b/trunk/drivers/input/touchscreen/ads7846.c
@@ -517,7 +517,9 @@ static void ads7846_rx(void *ads)
 	if (x == MAX_12BIT)
 		x = 0;
 
-	if (likely(x && z1)) {
+	if (ts->model == 7843) {
+		Rt = ts->pressure_max / 2;
+	} else if (likely(x && z1)) {
 		/* compute touch pressure resistance using equation #2 */
 		Rt = z2;
 		Rt -= z1;
@@ -525,11 +527,9 @@ static void ads7846_rx(void *ads)
 		Rt *= ts->x_plate_ohms;
 		Rt /= z1;
 		Rt = (Rt + 2047) >> 12;
-	} else
+	} else {
 		Rt = 0;
-
-	if (ts->model == 7843)
-		Rt = ts->pressure_max / 2;
+	}
 
 	/* Sample found inconsistent by debouncing or pressure is beyond
 	 * the maximum. Don't report it to user space, repeat at least