diff options
| author | Jorge A. Ventura <jorge.araujo.ventura@gmail.com> | 2014-08-09 16:06:58 -0500 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-10-13 15:41:06 +0200 |
| commit | a120ef8646dd4486d3f5c20469b189ef58aa55e5 (patch) | |
| tree | e2457bd6fd990e576d31c7c5a0b07dca63d5db22 /drivers/spi | |
| parent | f3a1710548df4e877c2ec66991fa9a9541317a31 (diff) | |
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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/spi')
| -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 ed4af4708d9a..5f19cc975b27 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -314,7 +314,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); |