Received-SPF: pass (google.com: domain of linux-kernel+bounces-187215-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
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 v2] Input: ili210x - fix ili251x_read_touch_data() return value
Date: Thu, 23 May 2024 09:56:24 +0100
Message-ID: <20240523085624.2295988-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?CtlTq+gjg1n1c1YVel/p9chMwDAyhij1Q9M92zbZkuAKl7v2MpV1/nTcavbd?=
 =?us-ascii?Q?zvaCFUvsl2eVUt2Dgdev5x9cBulyDQ143kud+VrYllN2t8XrexqVzseM0zUR?=
 =?us-ascii?Q?h93IfAoHHKvi4E3QS18K7eFwA4yX2+/GeWcXNItYz8rH7X7Ww7GPW/ry83aw?=
 =?us-ascii?Q?9HTTp0Q4hb2RPm7jCzUmBhqK0HMnedIlXz9cIKU+shXmLwCkLSplYr8+FA1n?=
 =?us-ascii?Q?evNf2vyVwg/ieRpN4rdUpmw6Un+QnuOkOmHe6VAobJQD7vIkeagMfrA/pr1e?=
 =?us-ascii?Q?EYFs6FdIArwVDlXAjam+vHaC15su6Lj/KXsQxs5lgvqR5efmhfs88ft2UmuS?=
 =?us-ascii?Q?4ZoE9SB98BuVwXUCc9z6MZUTKuPrISmVNs+14kBVB4FGMNuHsAGkgFQoaAjk?=
 =?us-ascii?Q?2xZhiYJfu8zaWUEzQHvO5WHXt5G1MG8loo1Q9Z1UbfSvnkU9UC96ArkebcLt?=
 =?us-ascii?Q?5O4zW6fGQ97xRSsWppYRaA8zUQB3TJoCmdk2znHoDZGxILES9XeuGOszVfDz?=
 =?us-ascii?Q?Z6Yuun2UJ7RZl+pmabd7TxRzj7ZJLJW3+zawEy5cHWLWTyV5eEI0AH7ZsSlj?=
 =?us-ascii?Q?6g53JEwtc7yld5Y+nobtPOm+3VbWOsJxohX+htizUjgFtOTMWhoXpoh5K2oG?=
 =?us-ascii?Q?y4Gy6MfeU7sx8zHT+beN0037Gd5sq6uzcZdEnuNNynB+CRdt347LNfxwTwrM?=
 =?us-ascii?Q?UnX2Su6+nEVjgW+mWAc6x4BikUOFN/muJwUU7iVrybd0AkdUln0WlVPRKb4t?=
 =?us-ascii?Q?2g1VCvCVTe1PF4fx3nItSYvD43OrVNxScV18QHl03M9T10cXiGJ4u3gZO5vw?=
 =?us-ascii?Q?xJnL07rvlaJCIXx8ewCX/+ekRe88rLYybx4iLRPTNR4yU3yOH84lkL0TMli8?=
 =?us-ascii?Q?1meepFAVWDEYkf3iuWOko00jZ77fP6DVVHx0AXTSxCANGr3ZWw30PQypS+0Y?=
 =?us-ascii?Q?nHHlEL6N0gIRQTr68eEB5H93okyrD+jR/W6+kRB5qdpMHDWNSG07tm9YdJMI?=
 =?us-ascii?Q?3wfGtmXEWEgjJM+LwGAjPuMwkDfRZ9toQQnzA5vrlbEY4TucQBtyI71MHf1/?=
 =?us-ascii?Q?6sogVktQ7LCRmnRLUS4mN3q0+qVON7UBWMOLPgDPtZgdxAHxA63JSPDV8Pq7?=
 =?us-ascii?Q?zckBwkK67fQoqwb4UxGcQvv+pd9qZmesVOT6ken9hRAelVhN0BdYNp3kDqP0?=
 =?us-ascii?Q?ZAQQT8LDMZYniHE3XMnvtsh432P/Tq4VgPz7B2pQ1HmEtqnpGTel/eU+ILhL?=
 =?us-ascii?Q?n5KSL5do3sovVSeu1EKlA3RsnyX+IgX1HlTMKeXPdpZ8ZtDmfylQEFss2j23?=
 =?us-ascii?Q?Cgb+Tgwe5t+zDwqQKcYniD8IQqc5FyxV1CLQttkxYm2pWYN2PXir5VSWFKKl?=
 =?us-ascii?Q?QaMQuLBa99jF2hJ5cqauyl0iHlWxCDtbqgE9f41MTC8DtiOaXP6AC44gc/9A?=
 =?us-ascii?Q?KTSWCnERYycUmTBANuX3ITnDvS68NY4GPtOwxe1DPZDF57yyZ5gYzsffPHSq?=
 =?us-ascii?Q?s9RebiNZ9tx/kDXXWAe1azggp2w0U9n17eNwwWuDd7vpym/06X0WRatoB5CY?=
 =?us-ascii?Q?3c1dCgxfEl31kIqG8hPv+CoN0R6GvLBnB9EhtLQeC5+1HiF5h9RxtstpA7gz?=
 =?us-ascii?Q?gQ=3D=3D?=
X-OriginatorOrg: inmusicbrands.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fbeff189-f657-448a-a7cf-08dc7b064025
X-MS-Exchange-CrossTenant-AuthSource: MW4PR08MB8282.namprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2024 08:56:35.8810
 (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: Kc+ZxeAJa/N4hl3qvxZQZArDVXRpiQPVcZzObHrl0RnjTC8+il2sCItgF36MzcK0xgBvgQcVv+9S5jbzZmFGAYuU+U8Nj2kP7rcLybU9zYo=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR08MB6574

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