Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux.git] / drivers / spi / spi-fsl-dspi.c

diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 8428b69c858bc960db75b80279003020c7a681fd..6ec2dcb8c57a6e969b59a5b5bd14d9dfe03f6f70 100644 (file)
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -396,17 +396,17 @@ static int dspi_request_dma(struct fsl_dspi *dspi, phys_addr_t phy_addr)
        if (!dma)
                return -ENOMEM;
 
-       dma->chan_rx = dma_request_slave_channel(dev, "rx");
-       if (!dma->chan_rx) {
+       dma->chan_rx = dma_request_chan(dev, "rx");
+       if (IS_ERR(dma->chan_rx)) {
                dev_err(dev, "rx dma channel not available\n");
-               ret = -ENODEV;
+               ret = PTR_ERR(dma->chan_rx);
                return ret;
        }
 
-       dma->chan_tx = dma_request_slave_channel(dev, "tx");
-       if (!dma->chan_tx) {
+       dma->chan_tx = dma_request_chan(dev, "tx");
+       if (IS_ERR(dma->chan_tx)) {
                dev_err(dev, "tx dma channel not available\n");
-               ret = -ENODEV;
+               ret = PTR_ERR(dma->chan_tx);
                goto err_tx_channel;
        }