diff options
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 222d3e37fc28..8fbfe2483ffd 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c | |||
@@ -609,7 +609,7 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t) | |||
609 | else | 609 | else |
610 | buf = (void *)t->tx_buf; | 610 | buf = (void *)t->tx_buf; |
611 | t->tx_dma = dma_map_single(&spi->dev, buf, | 611 | t->tx_dma = dma_map_single(&spi->dev, buf, |
612 | t->len, DMA_FROM_DEVICE); | 612 | t->len, DMA_TO_DEVICE); |
613 | if (!t->tx_dma) { | 613 | if (!t->tx_dma) { |
614 | ret = -EFAULT; | 614 | ret = -EFAULT; |
615 | goto err_tx_map; | 615 | goto err_tx_map; |
@@ -872,8 +872,8 @@ static int davinci_spi_probe(struct platform_device *pdev) | |||
872 | goto free_master; | 872 | goto free_master; |
873 | } | 873 | } |
874 | 874 | ||
875 | if (pdev->dev.platform_data) { | 875 | if (dev_get_platdata(&pdev->dev)) { |
876 | pdata = pdev->dev.platform_data; | 876 | pdata = dev_get_platdata(&pdev->dev); |
877 | dspi->pdata = *pdata; | 877 | dspi->pdata = *pdata; |
878 | } else { | 878 | } else { |
879 | /* update dspi pdata with that from the DT */ | 879 | /* update dspi pdata with that from the DT */ |