diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
| commit | 15dd859cacf312f606f54502d1f66537a1e5c78c (patch) | |
| tree | e50e125eaa6da83fa715704e53c1bde013d1ef8e /drivers/spi/spi_imx.c | |
| parent | b2d9d33412b9d13a40cd314d93ab517950fc5950 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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, |