diff mbox series

[v1] Input: resistive-adc-touch - fix division by zero error on z1 == 0

Message ID 20211007095727.29579-1-o.rempel@pengutronix.de (mailing list archive)
State Accepted
Commit fe0a7e3d012738b0034b3c97ddb0e8bc0a3ff0e6
Headers show
Series [v1] Input: resistive-adc-touch - fix division by zero error on z1 == 0 | expand

Commit Message

Oleksij Rempel Oct. 7, 2021, 9:57 a.m. UTC 
For proper pressure calculation we need at least x and z1 to be non
zero. Even worse, in case z1 we may run in to division by zero
error.

Fixes: 60b7db914ddd ("Input: resistive-adc-touch - rework mapping of channels")
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
 .../input/touchscreen/resistive-adc-touch.c   | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

Comments

Dmitry Torokhov Oct. 16, 2021, 4:16 a.m. UTC | #1 
On Thu, Oct 07, 2021 at 11:57:27AM +0200, Oleksij Rempel wrote:
> For proper pressure calculation we need at least x and z1 to be non
> zero. Even worse, in case z1 we may run in to division by zero
> error.
> 
> Fixes: 60b7db914ddd ("Input: resistive-adc-touch - rework mapping of channels")
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>

Applied, thank you.
diff mbox series

Patch

diff --git a/drivers/input/touchscreen/resistive-adc-touch.c b/drivers/input/touchscreen/resistive-adc-touch.c
index 744544a723b7..6f754a8d30b1 100644
--- a/drivers/input/touchscreen/resistive-adc-touch.c
+++ b/drivers/input/touchscreen/resistive-adc-touch.c
@@ -71,19 +71,22 @@  static int grts_cb(const void *data, void *private)
 		unsigned int z2 = touch_info[st->ch_map[GRTS_CH_Z2]];
 		unsigned int Rt;
 
-		Rt = z2;
-		Rt -= z1;
-		Rt *= st->x_plate_ohms;
-		Rt = DIV_ROUND_CLOSEST(Rt, 16);
-		Rt *= x;
-		Rt /= z1;
-		Rt = DIV_ROUND_CLOSEST(Rt, 256);
-		/*
-		 * On increased pressure the resistance (Rt) is decreasing
-		 * so, convert values to make it looks as real pressure.
-		 */
-		if (Rt < GRTS_DEFAULT_PRESSURE_MAX)
-			press = GRTS_DEFAULT_PRESSURE_MAX - Rt;
+		if (likely(x && z1)) {
+			Rt = z2;
+			Rt -= z1;
+			Rt *= st->x_plate_ohms;
+			Rt = DIV_ROUND_CLOSEST(Rt, 16);
+			Rt *= x;
+			Rt /= z1;
+			Rt = DIV_ROUND_CLOSEST(Rt, 256);
+			/*
+			 * On increased pressure the resistance (Rt) is
+			 * decreasing so, convert values to make it looks as
+			 * real pressure.
+			 */
+			if (Rt < GRTS_DEFAULT_PRESSURE_MAX)
+				press = GRTS_DEFAULT_PRESSURE_MAX - Rt;
+		}
 	}
 
 	if ((!x && !y) || (st->pressure && (press < st->pressure_min))) {