summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-davinci.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@baylibre.com>2017-01-12 03:18:40 +0100
committerMark Brown <broonie@kernel.org>2017-01-12 18:24:45 +0100
commitc5a2a394835f473ae23931eda5066d3771d7b2f8 (patch)
tree34867fce2558611a0443d10de1e796a049acbccb /drivers/spi/spi-davinci.c
parentMerge remote-tracking branches 'spi/topic/spidev', 'spi/topic/sunxi', 'spi/to... (diff)
downloadlinux-c5a2a394835f473ae23931eda5066d3771d7b2f8.tar.xz
linux-c5a2a394835f473ae23931eda5066d3771d7b2f8.zip
spi: davinci: use dma_mapping_error()
The correct error checking for dma_map_single() is to use dma_mapping_error(). Signed-off-by: Kevin Hilman <khilman@baylibre.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-davinci.c')
-rw-r--r--drivers/spi/spi-davinci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index d36c11b73a35..02fb96797ac8 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -646,7 +646,7 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
buf = t->rx_buf;
t->rx_dma = dma_map_single(&spi->dev, buf,
t->len, DMA_FROM_DEVICE);
- if (!t->rx_dma) {
+ if (dma_mapping_error(&spi->dev, !t->rx_dma)) {
ret = -EFAULT;
goto err_rx_map;
}
@@ -660,7 +660,7 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
buf = (void *)t->tx_buf;
t->tx_dma = dma_map_single(&spi->dev, buf,
t->len, DMA_TO_DEVICE);
- if (!t->tx_dma) {
+ if (dma_mapping_error(&spi->dev, t->tx_dma)) {
ret = -EFAULT;
goto err_tx_map;
}