From: Michael Tretter <[email protected]>
[ Upstream commit 6524d8eac258452e547f8a49c8a965ac6dd8a161 ]
The st1232 can switch from NORMAL to IDLE state after the configured
idle time (by default 8 s). If the st1232 is not reset during probe, it
might already be ready but in IDLE state. Since it does not enter NORMAL
state in this case, probe fails.
Fix the wait function to report the IDLE state as ready, too.
Fixes: f605be6a57b4 ("Input: st1232 - wait until device is ready before reading
resolution")
Signed-off-by: Michael Tretter <[email protected]>
Link:
https://lore.kernel.org/r/[email protected]
Signed-off-by: Dmitry Torokhov <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
---
drivers/input/touchscreen/st1232.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/input/touchscreen/st1232.c
b/drivers/input/touchscreen/st1232.c
index b4e7bcbe9b91d..885f0572488dd 100644
--- a/drivers/input/touchscreen/st1232.c
+++ b/drivers/input/touchscreen/st1232.c
@@ -94,7 +94,7 @@ 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 | ERROR_NONE))
+ if (!error && ts->read_buf[0] == (STATUS_NORMAL | STATUS_IDLE |
ERROR_NONE))
return 0;
usleep_range(1000, 2000);
--
2.27.0
