summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAddy Ke <addy.ke@rock-chips.com>2014-08-20 05:47:42 +0200
committerMark Brown <broonie@linaro.org>2014-08-20 17:31:17 +0200
commit0ac7a4904ae1a73ae4c2c18ff6a5dd2b7e03254c (patch)
tree0f6266acf5c411ddcc2229164637e5c85ffe6a71 /drivers
parentLinux 3.17-rc1 (diff)
downloadlinux-0ac7a4904ae1a73ae4c2c18ff6a5dd2b7e03254c.tar.xz
linux-0ac7a4904ae1a73ae4c2c18ff6a5dd2b7e03254c.zip
spi/rockchip: fixup incorrect dma direction setting
Signed-off-by: Addy Ke <addy.ke@rock-chips.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/spi-rockchip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index c0743604b906..6321326eb751 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -678,7 +678,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
rs->dma_tx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_TXDR);
rs->dma_rx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_RXDR);
rs->dma_tx.direction = DMA_MEM_TO_DEV;
- rs->dma_tx.direction = DMA_DEV_TO_MEM;
+ rs->dma_rx.direction = DMA_DEV_TO_MEM;
master->can_dma = rockchip_spi_can_dma;
master->dma_tx = rs->dma_tx.ch;