Commit fe0a7e3d authored by Oleksij Rempel's avatar Oleksij Rempel Committed by Dmitry Torokhov

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

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: 60b7db91 ("Input: resistive-adc-touch - rework mapping of channels")
Signed-off-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Link: https://lore.kernel.org/r/20211007095727.29579-1-o.rempel@pengutronix.deSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent d997cc17
...@@ -71,19 +71,22 @@ static int grts_cb(const void *data, void *private) ...@@ -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 z2 = touch_info[st->ch_map[GRTS_CH_Z2]];
unsigned int Rt; unsigned int Rt;
Rt = z2; if (likely(x && z1)) {
Rt -= z1; Rt = z2;
Rt *= st->x_plate_ohms; Rt -= z1;
Rt = DIV_ROUND_CLOSEST(Rt, 16); Rt *= st->x_plate_ohms;
Rt *= x; Rt = DIV_ROUND_CLOSEST(Rt, 16);
Rt /= z1; Rt *= x;
Rt = DIV_ROUND_CLOSEST(Rt, 256); 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. * On increased pressure the resistance (Rt) is
*/ * decreasing so, convert values to make it looks as
if (Rt < GRTS_DEFAULT_PRESSURE_MAX) * real pressure.
press = GRTS_DEFAULT_PRESSURE_MAX - Rt; */
if (Rt < GRTS_DEFAULT_PRESSURE_MAX)
press = GRTS_DEFAULT_PRESSURE_MAX - Rt;
}
} }
if ((!x && !y) || (st->pressure && (press < st->pressure_min))) { if ((!x && !y) || (st->pressure && (press < st->pressure_min))) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment