public inbox for linux-i2c@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] i2c: qup: Add error handling in qup_i2c_xfer_v2()
@ 2025-05-19 14:19 Wentao Liang
  2025-05-20  8:41 ` Andi Shyti
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Wentao Liang @ 2025-05-19 14:19 UTC (permalink / raw)
  To: andi.shyti; +Cc: linux-arm-msm, linux-i2c, linux-kernel, Wentao Liang, stable

The qup_i2c_xfer_v2() calls the qup_i2c_change_state() but does
not check its return value. A proper implementation can be
found in qup_i2c_xfer().

Add error handling for qup_i2c_change_state(). If the function
fails, return the error code.

Fixes: 7545c7dba169 ("i2c: qup: reorganization of driver code to remove polling for qup v2")
Cc: stable@vger.kernel.org # v4.17
Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
---
 drivers/i2c/busses/i2c-qup.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c
index da20b4487c9a..2477f570fe86 100644
--- a/drivers/i2c/busses/i2c-qup.c
+++ b/drivers/i2c/busses/i2c-qup.c
@@ -1538,7 +1538,7 @@ static int qup_i2c_xfer_v2(struct i2c_adapter *adap,
 			   int num)
 {
 	struct qup_i2c_dev *qup = i2c_get_adapdata(adap);
-	int ret, idx = 0;
+	int ret, err, idx = 0;
 
 	qup->bus_err = 0;
 	qup->qup_err = 0;
@@ -1588,7 +1588,9 @@ static int qup_i2c_xfer_v2(struct i2c_adapter *adap,
 		ret = qup_i2c_bus_active(qup, ONE_BYTE);
 
 	if (!ret)
-		qup_i2c_change_state(qup, QUP_RESET_STATE);
+		err = qup_i2c_change_state(qup, QUP_RESET_STATE);
+	if (err)
+		return err;
 
 	if (ret == 0)
 		ret = num;
-- 
2.42.0.windows.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2025-05-23  9:46 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-19 14:19 [PATCH] i2c: qup: Add error handling in qup_i2c_xfer_v2() Wentao Liang
2025-05-20  8:41 ` Andi Shyti
2025-05-20 11:16 ` Mukesh Kumar Savaliya
2025-05-20 11:51   ` Andi Shyti
2025-05-20 20:30 ` kernel test robot
2025-05-23  9:46 ` Dan Carpenter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox