diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-03 18:30:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-03 18:30:31 +0100 |
| commit | 72919f340245bbc9b81da35844134db2d675912a (patch) | |
| tree | 1616b36e1cc23f9b5bbd59153a5678e5906333fa /drivers/spi/spi-tegra20-slink.c | |
| parent | 997230d02cbd7d35f26b70bb67d8b09a58414aae (diff) | |
| download | linux-stable-72919f340245bbc9b81da35844134db2d675912a.tar.gz linux-stable-72919f340245bbc9b81da35844134db2d675912a.tar.bz2 linux-stable-72919f340245bbc9b81da35844134db2d675912a.zip | |
spi: tegra: slink: do prepare dma transfer with DMA_CTRL_ACK flag
This reverts commit faa98f7ea6c720beec8a800c9ac6975f760467e2 which was
applied in error due to discussion ending up in the wrong thread.
Diffstat (limited to 'drivers/spi/spi-tegra20-slink.c')
| -rw-r--r-- | drivers/spi/spi-tegra20-slink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c index 4e58b5399037..17224f0f4d56 100644 --- a/drivers/spi/spi-tegra20-slink.c +++ b/drivers/spi/spi-tegra20-slink.c @@ -467,7 +467,7 @@ static int tegra_slink_start_tx_dma(struct tegra_slink_data *tspi, int len) INIT_COMPLETION(tspi->tx_dma_complete); tspi->tx_dma_desc = dmaengine_prep_slave_single(tspi->tx_dma_chan, tspi->tx_dma_phys, len, DMA_MEM_TO_DEV, - DMA_PREP_INTERRUPT); + DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!tspi->tx_dma_desc) { dev_err(tspi->dev, "Not able to get desc for Tx\n"); return -EIO; @@ -486,7 +486,7 @@ static int tegra_slink_start_rx_dma(struct tegra_slink_data *tspi, int len) INIT_COMPLETION(tspi->rx_dma_complete); tspi->rx_dma_desc = dmaengine_prep_slave_single(tspi->rx_dma_chan, tspi->rx_dma_phys, len, DMA_DEV_TO_MEM, - DMA_PREP_INTERRUPT); + DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!tspi->rx_dma_desc) { dev_err(tspi->dev, "Not able to get desc for Rx\n"); return -EIO; |