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: 6524d8eac258452e ("Input: st1232 - add IDLE state as ready condition")
Signed-off-by: Geert Uytterhoeven <[email protected]>
Reviewed-by: Michael Tretter <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Dmitry Torokhov <[email protected]>

diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c
index 885f0572488dd0617b009cdea086f7e6f9355ed5..6abae665ca71d8ec22681fbc2a4f9eac2a0f85a1 100644 (file)
--- 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);
        }