---

yaml
---
r: 106911
b: refs/heads/master
c: 9460b65
h: refs/heads/master
i:
  106909: 5db82e1
  106907: d0e8a8e
  106903: ab736d4
  106895: 0c81525
  106879: c36e86c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 494f685775ee4c2f3db4081209f00ff0633243fc
+refs/heads/master: 9460b6529d8a0bfabf241ddda8b0e469d219844c

trunk/drivers/input/touchscreen/ads7846.c

@@ -517,19 +517,19 @@ 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;
 		Rt *= x;
 		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