Commit 6cdc1ef8 authored by Colin Ian King's avatar Colin Ian King Committed by Dmitry Torokhov

Input: resistive-adc-touch - fix uninitialized variable 'press'

In the case where st->ch_map[GRTS_CH_PRESSURE] < GRTS_MAX_CHANNELS is false
and also st->ch_map[GRTS_CH_Z1] < GRTS_MAX_CHANNELS is false the variable
press is not initialized and contains garbage. In this situation
st->pressure is also false, so we do not actually use press value, but
it is impossible for the compiler to realize this, and it emits
"uninitialized variable" warning. Fix this by initializing press
to 0 and allows us to also remove an else clause that sets press to 0.

Addresses-Coverity: ("Uninitialized scalar variable")
Fixes: 60b7db91 ("Input: resistive-adc-touch - rework mapping of channels")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Link: https://lore.kernel.org/r/20210603220809.155118-1-colin.king@canonical.comSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 2fcbda9a
...@@ -59,7 +59,7 @@ static int grts_cb(const void *data, void *private) ...@@ -59,7 +59,7 @@ static int grts_cb(const void *data, void *private)
{ {
const u16 *touch_info = data; const u16 *touch_info = data;
struct grts_state *st = private; struct grts_state *st = private;
unsigned int x, y, press; unsigned int x, y, press = 0;
x = touch_info[st->ch_map[GRTS_CH_X]]; x = touch_info[st->ch_map[GRTS_CH_X]];
y = touch_info[st->ch_map[GRTS_CH_Y]]; y = touch_info[st->ch_map[GRTS_CH_Y]];
...@@ -84,8 +84,6 @@ static int grts_cb(const void *data, void *private) ...@@ -84,8 +84,6 @@ static int grts_cb(const void *data, void *private)
*/ */
if (Rt < GRTS_DEFAULT_PRESSURE_MAX) if (Rt < GRTS_DEFAULT_PRESSURE_MAX)
press = GRTS_DEFAULT_PRESSURE_MAX - Rt; press = GRTS_DEFAULT_PRESSURE_MAX - Rt;
else
press = 0;
} }
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