Patch "spi: img-spfi: check for timeout error before proceeding" has been added to the 4.1-stable tree

This is a note to let you know that I've just added the patch titled

spi: img-spfi: check for timeout error before proceeding

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
spi-img-spfi-check-for-timeout-error-before-proceeding.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Sifan Naeem <[email protected]>
Date: Mon, 27 Jul 2015 13:11:15 +0100
Subject: spi: img-spfi: check for timeout error before proceeding

From: Sifan Naeem <[email protected]>

commit 011710e2ab659c7ad6e5e554806414bd7a9508be upstream.

Calling spfi_wait_all_done is not required if the transfer has timed out before all data is transferred.

spfi_wait_all_done polls for Alldone interrupt which is triggered to mark the transfer as complete and to indicate it is now safe to issue a new transfer.

---
 drivers/spi/spi-img-spfi.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

@@ -267,15 +267,15 @@ static int img_spfi_start_pio(struct spi
 		cpu_relax();
 	}
 
-	ret = spfi_wait_all_done(spfi);
-	if (ret < 0)
-		return ret;
-
 	if (rx_bytes > 0 || tx_bytes > 0) {
 		dev_err(spfi->dev, "PIO transfer timed out\n");
 		return -ETIMEDOUT;
 	}
 
+	ret = spfi_wait_all_done(spfi);
+	if (ret < 0)
+		return ret;
+
 	return 0;
 }
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/spi-img-spfi-check-for-timeout-error-before-proceeding.patch queue-4.1/spi-img-spfi-fix-multiple-calls-to-request-gpio.patch queue-4.1/spi-img-spfi-fix-kbuild-test-robot-warning.patch