summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-08 09:33:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-08 09:33:27 -0700
commit91b831a20709922563a2280ff9a9000fe41fbcb4 (patch)
tree33a209efefac97c466131469a7bf96e7a7b65213
parentbb014db07ce04851f0e19ef5c0f15ad0021ec38c (diff)
parent89c66ee890af18500fa4598db300cc07c267f900 (diff)
Merge tag 'spi-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fix from Mark Brown: "Just one update for SPI, a simple fix to the davinci driver to correct the direction for which DMA is mapped following the dmaengine conversion" * tag 'spi-v3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: spi: spi-davinci: Fix direction in dma_map_single()
-rw-r--r--drivers/spi/spi-davinci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 222d3e37fc2..707966bd561 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -609,7 +609,7 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
else
buf = (void *)t->tx_buf;
t->tx_dma = dma_map_single(&spi->dev, buf,
- t->len, DMA_FROM_DEVICE);
+ t->len, DMA_TO_DEVICE);
if (!t->tx_dma) {
ret = -EFAULT;
goto err_tx_map;