Received-SPF: pass (google.com: domain of linux-kernel+bounces-186022-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: John Keeping <jkeeping@inmusicbrands.com>
To: linux-input@vger.kernel.org
Cc: John Keeping <jkeeping@inmusicbrands.com>,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH] Input: ili210x - fix ili251x_read_touch_data() return value
Date: Wed, 22 May 2024 11:03:41 +0100
Message-ID: <20240522100341.1650842-1-jkeeping@inmusicbrands.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?ovtPzInskIpQpibpj68TwClr7/MxJzIaH4Ho76Rx5d8dD01T2XxuPVLyezXZ?=
 =?us-ascii?Q?68yIkMoq5s0xqpHH+pfOagrO9a9Z0m6vDxDs6EtikArF7iDMg0pyKpXByMGw?=
 =?us-ascii?Q?vNGtQVcHsMLXQ1hCbPqAZcCy0r5rp3ngt9YkmU47touLBOkJsUD80uu9+Rm0?=
 =?us-ascii?Q?2MAoIaPl7A9h5CWINRYwzwci7DPBXp9eCalLOEeSrvsNsvbgimM1FUX6XKZS?=
 =?us-ascii?Q?4rtTr1Mz512t2VOwXjx1J6cGJ2SJFunrgE37ibjwyjf1dhrUYY1f6+fzzfmP?=
 =?us-ascii?Q?zbzjfn45F1TfQ1cRCeNQtmOo9VHzV8frjX4tmvj/m3HLdJ7+uPYJmR+dmZ7P?=
 =?us-ascii?Q?LFIFVwVWU/RK5q/UXqSmMEKKlA9PRhHgSxAe1k4LLI4Hl2GSDtIKABranEbP?=
 =?us-ascii?Q?Wuy/WFoVLbFT9WCebGJvhIMrwDp2IKbHHeFdOvbThOFIec973qWCoXibo9sS?=
 =?us-ascii?Q?aS/XCF1gg3Jl9tLzYpToFZdeFyjy88JfKYlM8Jf1gZ2Uq4zSbZoi1cfBedxj?=
 =?us-ascii?Q?WsfMdu1CnwmejT27Zj/lqFohTE56aEIGWx5l7GwInojZ3TC6RmNSMhmi6qQq?=
 =?us-ascii?Q?fKUhkWfwLWZqD58n2k5k3eI68et7YLtzqgid2G4C5H5JrybkLa5bKWY7zZwf?=
 =?us-ascii?Q?NuhPBRitoH4S2lnMLv186Q1RqIPSHXWcwQG/O7R+H4DVxR22++ekZOt8Z1t4?=
 =?us-ascii?Q?kd7jU6PVHsSpQsom0sTRkmmmgBXO1oBPlYBdBNR8WdgV8PfKS5TSHIYFpxBb?=
 =?us-ascii?Q?vhqibZy0Lju+RcTm8oErVRx9pC418rbSI703MYSGLCC0g13YCzArbH1k4vas?=
 =?us-ascii?Q?sW2/O9DMcTsULDn6OQdO5H+sx7PKER3tBM4m0mPCmutVPy9hmuZLjNNsuFKm?=
 =?us-ascii?Q?QGo4Gm+7MIbpyOCQwHJ3k0ChdkWlzRv/JJZI6iSNhbk4hKlg64u/z3lnjfs1?=
 =?us-ascii?Q?pN5evXh6bhqB0LpvjPBrMDzeTlPKG019TJF+2QcIKhl+js+n2HK4NTPbv8AL?=
 =?us-ascii?Q?F2Nr3oABS19iyjGzttp144UAYRUq+Ug5wSTPgJbTsXIsvhtSEPZO+2WyfOLK?=
 =?us-ascii?Q?72mG8gdxANBhT+flxah+17SY2/WbwK2hO1LHYPnkdX0KzhDrGK8C0Mjc6QN3?=
 =?us-ascii?Q?CjaThWevUlFYoKtB8/yaI/h9RBu3mW4/Jbcl8MlM90N+YMkgwVKyno/hgBVg?=
 =?us-ascii?Q?aj9QxNmptDUNPvLJQP/H6Vek1VcrFfoECkoXB4QFXClNUz7/cEIJN0XVfJ6F?=
 =?us-ascii?Q?sUnyr3cSNfVnz0WSfwpXHc5+71XybLiKlxBM2LbRyUy+9n8dvSXe3KCqEVVH?=
 =?us-ascii?Q?CE74OpwU6IupSsQPN9U0cR635cNlBtMrytIEBHqe1V86L6nmly2MXwlrOzw/?=
 =?us-ascii?Q?uxIcAvTYRLuRlHfxVWXjOLcXy6PdkTeHz+hx2+T1gRDW0rdwQqNpBJmrw/81?=
 =?us-ascii?Q?OW1XBwBbTIJ+NXAXVGtR6CStKNAUcnutxOvcIMyuUrLtljyQ+K4/MPQCGOZc?=
 =?us-ascii?Q?Wpk6nbe5mKWn58ky4NbKJh+XWtdkktJ+I6D7gk4SbvHma4PiQ2LDTwB7pdK2?=
 =?us-ascii?Q?+Jy0OPlrNb707rcA0rXs0F4EXw/Tfui/2VNeM3+AixNaI6QZcOiOX07p7h+c?=
 =?us-ascii?Q?Zw=3D=3D?=
X-OriginatorOrg: inmusicbrands.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fdd9bd44-4b61-409c-8059-08dc7a468011
X-MS-Exchange-CrossTenant-AuthSource: MW4PR08MB8282.namprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2024 10:03:59.5649
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 24507e43-fb7c-4b60-ab03-f78fafaf0a65
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: o4O0ohk+0nugsZY3+UkRczHzrhXyxfsYygxBfyr0no/ENZp+n6sLyoJDIKkVkFNEJcaS3Cj3tIZOLwtRU3cdrtn7n5/PjVrohlJ/9xvp5gE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR08MB6730

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.
Follow the same pattern as ili211x_read_touch_data() to return zero when
the correct number of bytes is read and a negative error code otherwise.

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

Signed-off-by: John Keeping <jkeeping@inmusicbrands.com>
---
 drivers/input/touchscreen/ili210x.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/input/touchscreen/ili210x.c b/drivers/input/touchscreen/ili210x.c
index 31ffdc2a93f35..8846c6d10fc0d 100644
--- a/drivers/input/touchscreen/ili210x.c
+++ b/drivers/input/touchscreen/ili210x.c
@@ -255,14 +255,15 @@ static int ili251x_read_reg(struct i2c_client *client,
 static int ili251x_read_touch_data(struct i2c_client *client, u8 *data)
 {
 	int error;
+	int ret;
 
 	error = ili251x_read_reg_common(client, REG_TOUCHDATA,
 					data, ILI251X_DATA_SIZE1, 0);
 	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;
+		ret = i2c_master_recv(client, data + ILI251X_DATA_SIZE1,
+				      ILI251X_DATA_SIZE2);
+		if (ret != ILI251X_DATA_SIZE2)
+			error = ret < 0 ? ret : -EIO;
 	}
 
 	return error;
-- 
2.45.1