diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 56b4109..8ed1aee 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -599,8 +599,10 @@
 			goto out;
 		}
 
-		if (ret > 0)
+		if (ret > 0) {
+			ret = 0;
 			wait_for_completion(&master->xfer_completion);
+		}
 
 		trace_spi_transfer_stop(msg, xfer);