Commit 91b831a2 authored Aug 08, 2013 by Linus Torvalds

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()

parents bb014db0 89c66ee8

drivers/spi/spi-davinci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;