summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorMichael Tretter <m.tretter@pengutronix.de>2021-02-19 10:37:00 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2021-02-19 11:03:44 -0800
commit6524d8eac258452e547f8a49c8a965ac6dd8a161 (patch)
treee14cfc18bb63a392a4752583a183d639fcda8b10 /drivers/input
parent42ffcd1dba1796bcda386eb6f260df9fc23c90af (diff)
downloadlinux-stable-6524d8eac258452e547f8a49c8a965ac6dd8a161.tar.gz
linux-stable-6524d8eac258452e547f8a49c8a965ac6dd8a161.tar.bz2
linux-stable-6524d8eac258452e547f8a49c8a965ac6dd8a161.zip
Input: st1232 - add IDLE state as ready condition
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 <m.tretter@pengutronix.de> Link: https://lore.kernel.org/r/20210219110556.1858969-1-m.tretter@pengutronix.de Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/st1232.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c
index b4e7bcbe9b91..885f0572488d 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);