diff options
author | Jorge A. Ventura <jorge.araujo.ventura@gmail.com> | 2014-08-09 16:06:58 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-05 13:41:01 -0700 |
commit | 5f53a1e9cf1f3d44ef269c60ea979d719716d1cf (patch) | |
tree | e49a3e1ef54ead5c7fec464dfc23a9c987bcae8f | |
parent | 08c01d234b4324df20b4c2d09c6950108f4d0d83 (diff) | |
download | linux-stable-5f53a1e9cf1f3d44ef269c60ea979d719716d1cf.tar.gz linux-stable-5f53a1e9cf1f3d44ef269c60ea979d719716d1cf.tar.bz2 linux-stable-5f53a1e9cf1f3d44ef269c60ea979d719716d1cf.zip |
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@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/spi/spi-omap2-mcspi.c | 3 |
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); |