This is a note to let you know that I've just added the patch titled spi/omap-mcspi: Fix the spi task hangs waiting dma_rx to the 3.14-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-omap-mcspi-fix-the-spi-task-hangs-waiting-dma_rx.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 3d0763c006f8da1b44a9f5f9a21187f5b8f674f4 Mon Sep 17 00:00:00 2001 From: "Jorge A. Ventura" <jorge.araujo.ventura@xxxxxxxxx> Date: Sat, 9 Aug 2014 16:06:58 -0500 Subject: spi/omap-mcspi: Fix the spi task hangs waiting dma_rx From: "Jorge A. Ventura" <jorge.araujo.ventura@xxxxxxxxx> commit 3d0763c006f8da1b44a9f5f9a21187f5b8f674f4 upstream. The spi hangs waiting the completion of omap2_mcspi_rx_callback. Signed-off-by: Jorge A. Ventura <jorge.araujo.ventura@xxxxxxxxx> Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/spi/spi-omap2-mcspi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -321,7 +321,8 @@ static void omap2_mcspi_set_fifo(const s 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); Patches currently in stable-queue which might be from jorge.araujo.ventura@xxxxxxxxx are queue-3.14/spi-omap-mcspi-fix-the-spi-task-hangs-waiting-dma_rx.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html