From: Jorge A. Ventura <jorge.araujo.ventura@gmail.com>
Date: Sat, 9 Aug 2014 21:06:58 +0000 (-0500)
Subject: spi/omap-mcspi: Fix the spi task hangs waiting dma_rx
X-Git-Tag: v3.17-rc3~5^2~1^2^6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3d0763c006f8da1b44a9f5f9a21187f5b8f674f4;p=karo-tx-linux.git

spi/omap-mcspi: Fix the spi task hangs waiting dma_rx

The spi hangs waiting the completion of omap2_mcspi_rx_callback.

Signed-off-by: Jorge A. Ventura <jorge.araujo.ventura@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org
---

diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 68441fa448de..352eed7463ac 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -329,7 +329,8 @@ static void omap2_mcspi_set_fifo(const struct spi_device *spi,
 disable_fifo:
 	if (t->rx_buf != NULL)
 		chconf &= ~OMAP2_MCSPI_CHCONF_FFER;
-	else
+
+	if (t->tx_buf != NULL)
 		chconf &= ~OMAP2_MCSPI_CHCONF_FFET;
 
 	mcspi_write_chconf0(spi, chconf);