[v2] Input: ili210x - fix ili251x_read_touch_data() return value

[PATCH v2] Input: ili210x - fix ili251x_read_touch_data() return value

Posted by John Keeping 1 year, 8 months ago

The caller of this function treats all non-zero values as an error, so
the return value of i2c_master_recv() cannot be returned directly.

This fixes touch reporting when there are more than 6 active touches.

Fixes: ef536abd3afd1 ("Input: ili210x - define and use chip operations structure")
Signed-off-by: John Keeping <jkeeping@inmusicbrands.com>
---
Changes since v1:
- Simplify change to avoid introducing a new variable
- Add Fixes tag

 drivers/input/touchscreen/ili210x.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/touchscreen/ili210x.c b/drivers/input/touchscreen/ili210x.c
index 31ffdc2a93f35..79bdb2b109496 100644
--- a/drivers/input/touchscreen/ili210x.c
+++ b/drivers/input/touchscreen/ili210x.c
@@ -261,8 +261,8 @@ static int ili251x_read_touch_data(struct i2c_client *client, u8 *data)
 	if (!error && data[0] == 2) {
 		error = i2c_master_recv(client, data + ILI251X_DATA_SIZE1,
 					ILI251X_DATA_SIZE2);
-		if (error >= 0 && error != ILI251X_DATA_SIZE2)
-			error = -EIO;
+		if (error >= 0)
+			error = error == ILI251X_DATA_SIZE2 ? 0 : -EIO;
 	}
 
 	return error;
-- 
2.45.1

Re: [PATCH v2] Input: ili210x - fix ili251x_read_touch_data() return value

Posted by Dmitry Torokhov 1 year, 8 months ago

On Thu, May 23, 2024 at 09:56:24AM +0100, John Keeping wrote:
> The caller of this function treats all non-zero values as an error, so
> the return value of i2c_master_recv() cannot be returned directly.
> 
> This fixes touch reporting when there are more than 6 active touches.
> 
> Fixes: ef536abd3afd1 ("Input: ili210x - define and use chip operations structure")
> Signed-off-by: John Keeping <jkeeping@inmusicbrands.com>

Applied, thank you.

-- 
Dmitry