diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
| commit | d9ecdb282c91952796b7542c4f57fd6de6948d7b (patch) | |
| tree | fd4de7923968afa7d2981fb037e2255fc2cfa1e1 /drivers/spi/spi_imx.c | |
| parent | 4ef584ba84125b67c17b5aded38e7783cd8cdef0 (diff) | |
| parent | 1d1f8b377c48e5aeddaea52eba74cc0539f088cd (diff) | |
Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im
Diffstat (limited to 'drivers/spi/spi_imx.c')
| -rw-r--r-- | drivers/spi/spi_imx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c index 54ac7bea5f8c..6fb77fcc4971 100644 --- a/drivers/spi/spi_imx.c +++ b/drivers/spi/spi_imx.c | |||
| @@ -491,7 +491,7 @@ static int map_dma_buffers(struct driver_data *drv_data) | |||
| 491 | buf, | 491 | buf, |
| 492 | drv_data->tx_map_len, | 492 | drv_data->tx_map_len, |
| 493 | DMA_TO_DEVICE); | 493 | DMA_TO_DEVICE); |
| 494 | if (dma_mapping_error(drv_data->tx_dma)) | 494 | if (dma_mapping_error(dev, drv_data->tx_dma)) |
| 495 | return -1; | 495 | return -1; |
| 496 | 496 | ||
| 497 | drv_data->tx_dma_needs_unmap = 1; | 497 | drv_data->tx_dma_needs_unmap = 1; |
| @@ -516,7 +516,7 @@ static int map_dma_buffers(struct driver_data *drv_data) | |||
| 516 | buf, | 516 | buf, |
| 517 | drv_data->len, | 517 | drv_data->len, |
| 518 | DMA_FROM_DEVICE); | 518 | DMA_FROM_DEVICE); |
| 519 | if (dma_mapping_error(drv_data->rx_dma)) | 519 | if (dma_mapping_error(dev, drv_data->rx_dma)) |
| 520 | return -1; | 520 | return -1; |
| 521 | drv_data->rx_dma_needs_unmap = 1; | 521 | drv_data->rx_dma_needs_unmap = 1; |
| 522 | } | 522 | } |
| @@ -534,7 +534,7 @@ static int map_dma_buffers(struct driver_data *drv_data) | |||
| 534 | buf, | 534 | buf, |
| 535 | drv_data->tx_map_len, | 535 | drv_data->tx_map_len, |
| 536 | DMA_TO_DEVICE); | 536 | DMA_TO_DEVICE); |
| 537 | if (dma_mapping_error(drv_data->tx_dma)) { | 537 | if (dma_mapping_error(dev, drv_data->tx_dma)) { |
| 538 | if (drv_data->rx_dma) { | 538 | if (drv_data->rx_dma) { |
| 539 | dma_unmap_single(dev, | 539 | dma_unmap_single(dev, |
| 540 | drv_data->rx_dma, | 540 | drv_data->rx_dma, |