On Tue, 23 Feb 2021 10:02:01 +0100, Geert Uytterhoeven wrote:
> 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.
Thanks. I missed that the state is actually a value and not a bitfield.
>
> Fix the wait function to report either state as ready.
>
> Fixes: 6524d8eac258452e ("Input: st1232 - add IDLE state as ready condition")
> Signed-off-by: Geert Uytterhoeven <geert+rene...@glider.be>
Reviewed-by: Michael Tretter <m.tret...@pengutronix.de>
> ---
> drivers/input/touchscreen/st1232.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/touchscreen/st1232.c
> b/drivers/input/touchscreen/st1232.c
> index 885f0572488dd061..6abae665ca71d8ec 100644
> --- a/drivers/input/touchscreen/st1232.c
> +++ b/drivers/input/touchscreen/st1232.c
> @@ -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))
> - return 0;
> + if (!error) {
> + switch (ts->read_buf[0]) {
> + case STATUS_NORMAL | ERROR_NONE:
> + case STATUS_IDLE | ERROR_NONE:
> + return 0;
> + }
> + }
>
> usleep_range(1000, 2000);
> }
> --
> 2.25.1
>
>
