From: Gao Pan <pandy.gao@nxp.com>
Date: Fri, 2 Dec 2016 03:50:01 +0000 (+0800)
Subject: spi: fsl-lpspi: quit reading rx fifo under error condition
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d989eed20791534dc624c7b29568b263c67a286f;p=linux-beck.git

spi: fsl-lpspi: quit reading rx fifo under error condition

In case that error occurs during waiting for txfifo empty, it is
not necessary to read rx fifo. It's better to return directly.

Signed-off-by: Gao Pan <pandy.gao@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c
index c4a4e2622a53..52551f6d0c7d 100644
--- a/drivers/spi/spi-fsl-lpspi.c
+++ b/drivers/spi/spi-fsl-lpspi.c
@@ -350,9 +350,12 @@ static int fsl_lpspi_transfer_one(struct spi_master *master,
 	}
 
 	ret = fsl_lpspi_txfifo_empty(fsl_lpspi);
+	if (ret)
+		return ret;
+
 	fsl_lpspi_read_rx_fifo(fsl_lpspi);
 
-	return ret;
+	return 0;
 }
 
 static int fsl_lpspi_transfer_one_msg(struct spi_master *master,