[3.13.y.z extended stable] Patch "spi/omap-mcspi: Fix the spi task hangs waiting dma_rx" has been added to staging queue

Kamal Mostafa kamal at canonical.com
Tue Sep 30 21:29:31 UTC 2014

This is a note to let you know that I have just added a patch titled

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

to the linux-3.13.y-queue branch of the 3.13.y.z extended stable tree 
which can be found at:


This patch is scheduled to be released in version

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.13.y.z tree, see



>From 1cbdb1fb00c2886b97f6e635276824d00e4d6b64 Mon Sep 17 00:00:00 2001
From: "Jorge A. Ventura" <jorge.araujo.ventura at gmail.com>
Date: Sat, 9 Aug 2014 16:06:58 -0500
Subject: spi/omap-mcspi: Fix the spi task hangs waiting dma_rx

commit 3d0763c006f8da1b44a9f5f9a21187f5b8f674f4 upstream.

The spi hangs waiting the completion of omap2_mcspi_rx_callback.

Signed-off-by: Jorge A. Ventura <jorge.araujo.ventura at gmail.com>
Signed-off-by: Mark Brown <broonie at linaro.org>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
 drivers/spi/spi-omap2-mcspi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 443df39..4935467 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -320,7 +320,8 @@ static void omap2_mcspi_set_fifo(const struct spi_device *spi,
 	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);

More information about the kernel-team mailing list