diff --git a/drivers/i3c/master/i3c-master-qcom-geni.c b/drivers/i3c/master/i3c-master-qcom-geni.c
index 800c1ad73a10..12b864485060 100644
--- a/drivers/i3c/master/i3c-master-qcom-geni.c
+++ b/drivers/i3c/master/i3c-master-qcom-geni.c
@@ -761,6 +761,7 @@ static int _i3c_geni_execute_command
 	enum i3c_trans_dir rnw = gi3c->cur_rnw;
 	u32 len = gi3c->cur_len;
 
+	reinit_completion(&gi3c->done);
 	geni_se_select_mode(gi3c->se.base, xfer->mode);
 
 	gi3c->err = 0;
@@ -810,8 +811,8 @@ static int _i3c_geni_execute_command
 			writel_relaxed(1, gi3c->se.base +
 				SE_GENI_TX_WATERMARK_REG);
 	}
-	time_remaining = wait_for_completion_timeout(&gi3c->done,
-						XFER_TIMEOUT);
+
+	time_remaining = wait_for_completion_timeout(&gi3c->done, XFER_TIMEOUT);
 	if (!time_remaining) {
 		unsigned long flags;
 
@@ -854,7 +855,11 @@ static int _i3c_geni_execute_command
 			else
 				writel_relaxed(1, gi3c->se.base +
 					SE_DMA_TX_FSM_RST);
+			time_remaining =
 			wait_for_completion_timeout(&gi3c->done, XFER_TIMEOUT);
+			if (!time_remaining)
+				GENI_SE_ERR(gi3c->ipcl, true, gi3c->se.dev,
+					"Timeout:FSM Reset, rnw:%d\n", rnw);
 		}
 		geni_se_rx_dma_unprep(gi3c->se.i3c_rsc.wrapper_dev,
 				rx_dma, len);