aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge A. Ventura <jorge.araujo.ventura@gmail.com>2014-08-09 16:06:58 -0500
committerMark Brown <broonie@linaro.org>2014-08-11 19:55:51 +0100
commit3d0763c006f8da1b44a9f5f9a21187f5b8f674f4 (patch)
tree3b1107cd25aaa92fad225d55f91fd21845e774e9
parentfab6a0410d20ef09238ef54b8726d170578da752 (diff)
downloadlinux-stericsson-3d0763c006f8da1b44a9f5f9a21187f5b8f674f4.tar.gz
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
-rw-r--r--drivers/spi/spi-omap2-mcspi.c3
1 files changed, 2 insertions, 1 deletions
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);