diff options
author | Shubhrajyoti D <shubhrajyoti@ti.com> | 2012-03-20 06:40:09 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-03-30 18:46:22 -0400 |
commit | 9232b9b1b57dc5c01f435433e70e26c122bf4e44 (patch) | |
tree | 90882d75beac87a21680d3501263bcbb00d6b8b0 /drivers/spi/spi-davinci.c | |
parent | 327ef2e9048a5e39bf84d7f17f78a87e7a068742 (diff) |
spi/davinci: Fix DMA API usage in davinci
The driver uses NULL for dma_unmap_single instead of
the struct device that the API expects.
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Tested-by: Akshay Shankarmurthy <akshay.s@ti.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi/spi-davinci.c')
-rw-r--r-- | drivers/spi/spi-davinci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c index 31bfba805cf4..9b2901feaf78 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c | |||
@@ -653,7 +653,7 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t) | |||
653 | dev_dbg(sdev, "Couldn't DMA map a %d bytes RX buffer\n", | 653 | dev_dbg(sdev, "Couldn't DMA map a %d bytes RX buffer\n", |
654 | rx_buf_count); | 654 | rx_buf_count); |
655 | if (t->tx_buf) | 655 | if (t->tx_buf) |
656 | dma_unmap_single(NULL, t->tx_dma, t->len, | 656 | dma_unmap_single(&spi->dev, t->tx_dma, t->len, |
657 | DMA_TO_DEVICE); | 657 | DMA_TO_DEVICE); |
658 | return -ENOMEM; | 658 | return -ENOMEM; |
659 | } | 659 | } |
@@ -692,10 +692,10 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t) | |||
692 | if (spicfg->io_type == SPI_IO_TYPE_DMA) { | 692 | if (spicfg->io_type == SPI_IO_TYPE_DMA) { |
693 | 693 | ||
694 | if (t->tx_buf) | 694 | if (t->tx_buf) |
695 | dma_unmap_single(NULL, t->tx_dma, t->len, | 695 | dma_unmap_single(&spi->dev, t->tx_dma, t->len, |
696 | DMA_TO_DEVICE); | 696 | DMA_TO_DEVICE); |
697 | 697 | ||
698 | dma_unmap_single(NULL, t->rx_dma, rx_buf_count, | 698 | dma_unmap_single(&spi->dev, t->rx_dma, rx_buf_count, |
699 | DMA_FROM_DEVICE); | 699 | DMA_FROM_DEVICE); |
700 | 700 | ||
701 | clear_io_bits(dspi->base + SPIINT, SPIINT_DMA_REQ_EN); | 701 | clear_io_bits(dspi->base + SPIINT, SPIINT_DMA_REQ_EN); |