From d06d8b525ec71854c658da2744696fc5d266dcb3 Mon Sep 17 00:00:00 2001
From: Shubhrajyoti D <shubhrajyoti@ti.com>
Date: Tue, 20 Mar 2012 16:10:09 +0530
Subject: [PATCH] --- yaml --- r: 299167 b: refs/heads/master c:
 9232b9b1b57dc5c01f435433e70e26c122bf4e44 h: refs/heads/master i:   299165:
 2a002305b085d4403c63ec823aed51818451677c   299163:
 d20e9ea48521c16fd3bdb6f89195550dc7c9f19d   299159:
 f93421a311e909ca147164f3222ebc1146c71ad5   299151:
 5ef78a5b2be58aaaf9c38cccdf2a9c34fc972207   299135:
 140c524356e829259f432e6ef9a8f7beae0aac50 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/spi/spi-davinci.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3931e7d5c93a..ed9a6e14651a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 327ef2e9048a5e39bf84d7f17f78a87e7a068742
+refs/heads/master: 9232b9b1b57dc5c01f435433e70e26c122bf4e44
diff --git a/trunk/drivers/spi/spi-davinci.c b/trunk/drivers/spi/spi-davinci.c
index 31bfba805cf4..9b2901feaf78 100644
--- a/trunk/drivers/spi/spi-davinci.c
+++ b/trunk/drivers/spi/spi-davinci.c
@@ -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);