]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
spi/davinci: Fix DMA API usage in davinci
authorShubhrajyoti D <shubhrajyoti@ti.com>
Tue, 20 Mar 2012 10:40:09 +0000 (16:10 +0530)
committerGrant Likely <grant.likely@secretlab.ca>
Fri, 30 Mar 2012 22:46:22 +0000 (16:46 -0600)
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>
drivers/spi/spi-davinci.c

index 31bfba805cf473e51edbeb437a72666f9b735595..9b2901feaf78d4bf3783c9b8b3491f57bfdc2e83 100644 (file)
@@ -653,7 +653,7 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
                        dev_dbg(sdev, "Couldn't DMA map a %d bytes RX buffer\n",
                                                                rx_buf_count);
                        if (t->tx_buf)
-                               dma_unmap_single(NULL, t->tx_dma, t->len,
+                               dma_unmap_single(&spi->dev, t->tx_dma, t->len,
                                                                DMA_TO_DEVICE);
                        return -ENOMEM;
                }
@@ -692,10 +692,10 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
        if (spicfg->io_type == SPI_IO_TYPE_DMA) {
 
                if (t->tx_buf)
-                       dma_unmap_single(NULL, t->tx_dma, t->len,
+                       dma_unmap_single(&spi->dev, t->tx_dma, t->len,
                                                                DMA_TO_DEVICE);
 
-               dma_unmap_single(NULL, t->rx_dma, rx_buf_count,
+               dma_unmap_single(&spi->dev, t->rx_dma, rx_buf_count,
                                                        DMA_FROM_DEVICE);
 
                clear_io_bits(dspi->base + SPIINT, SPIINT_DMA_REQ_EN);