Commit 1bff77f4 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Dmitry Torokhov
Browse files

Input: st1232 - fix NORMAL vs. IDLE state handling 



NORMAL (0x0) and IDLE (0x4) are really two different states.  Hence you
cannot check for both using a bitmask, as that checks for IDLE only,
breaking operation for devices that are in NORMAL state.

Fix the wait function to report either state as ready.

Fixes: 6524d8ea ("Input: st1232 - add IDLE state as ready condition")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarMichael Tretter <m.tretter@pengutronix.de>
Link: https://lore.kernel.org/r/20210223090201.1430542-1-geert+renesas@glider.be


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent cbecf716

drivers/input/touchscreen/st1232.c

+7 −2
Original line number Diff line number Diff line
@@ -94,8 +94,13 @@ static int st1232_ts_wait_ready(struct st1232_ts_data *ts) 


	for (retries = 10; retries; retries--) {

		error = st1232_ts_read_data(ts, REG_STATUS, 1);

		if (!error && ts->read_buf[0] == (STATUS_NORMAL | STATUS_IDLE | ERROR_NONE))

		if (!error) {

			switch (ts->read_buf[0]) {

			case STATUS_NORMAL | ERROR_NONE:

			case STATUS_IDLE | ERROR_NONE:

				return 0;

			}

		}



		usleep_range(1000, 2000);

	}