| Message ID | 20231222183114.30775-3-francesco@dolcini.it (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Input: ilitek_ts_i2c - Fix spurious input events | expand |
On Fri, Dec 22, 2023 at 07:31:14PM +0100, Francesco Dolcini wrote: > From: Emanuele Ghidoli <emanuele.ghidoli@toradex.com> > > Ilitek touch IC driver answer to plain i2c read request, after it has > generated an interrupt request, with a report id message starting > with an identifier and a series of points. > If a request is sent unsolicited by an interrupt request the answer > do not contain this identifier. > Add a test to discard these messages, making the driver robust to > spurious interrupt requests. > > Fixes: 42370681bd46 ("Input: Add support for ILITEK Lego Series") > Reviewed-by: Francesco Dolcini <francesco.dolcini@toradex.com> > Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com> > Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com> > --- > v3: added reviewed by > --- > drivers/input/touchscreen/ilitek_ts_i2c.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/input/touchscreen/ilitek_ts_i2c.c b/drivers/input/touchscreen/ilitek_ts_i2c.c > index 250133f0d68f..557362490244 100644 > --- a/drivers/input/touchscreen/ilitek_ts_i2c.c > +++ b/drivers/input/touchscreen/ilitek_ts_i2c.c > @@ -37,6 +37,8 @@ > #define ILITEK_TP_CMD_GET_MCU_VER 0x61 > #define ILITEK_TP_CMD_GET_IC_MODE 0xC0 > > +#define ILITEK_TP_I2C_REPORT_ID 0x48 > + > #define REPORT_COUNT_ADDRESS 61 > #define ILITEK_SUPPORT_MAX_POINT 40 > > @@ -163,6 +165,11 @@ static int ilitek_process_and_report_v6(struct ilitek_ts_data *ts) > goto err_sync_frame; > } > > + if (buf[0] != ILITEK_TP_I2C_REPORT_ID) { > + dev_err(dev, "get touch info failed. Wrong id: 0x%02X\n", buf[0]); > + goto err_sync_frame; Please rebase and use direct return once you fix the previous patch. Thanks.
diff --git a/drivers/input/touchscreen/ilitek_ts_i2c.c b/drivers/input/touchscreen/ilitek_ts_i2c.c index 250133f0d68f..557362490244 100644 --- a/drivers/input/touchscreen/ilitek_ts_i2c.c +++ b/drivers/input/touchscreen/ilitek_ts_i2c.c @@ -37,6 +37,8 @@ #define ILITEK_TP_CMD_GET_MCU_VER 0x61 #define ILITEK_TP_CMD_GET_IC_MODE 0xC0 +#define ILITEK_TP_I2C_REPORT_ID 0x48 + #define REPORT_COUNT_ADDRESS 61 #define ILITEK_SUPPORT_MAX_POINT 40 @@ -163,6 +165,11 @@ static int ilitek_process_and_report_v6(struct ilitek_ts_data *ts) goto err_sync_frame; } + if (buf[0] != ILITEK_TP_I2C_REPORT_ID) { + dev_err(dev, "get touch info failed. Wrong id: 0x%02X\n", buf[0]); + goto err_sync_frame; + } + report_max_point = buf[REPORT_COUNT_ADDRESS]; if (report_max_point > ts->max_tp) { dev_err(dev, "FW report max point:%d > panel info. max:%d\n",