diff options
author | Mark Brown <broonie@kernel.org> | 2020-01-23 12:37:18 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-01-23 12:37:18 +0000 |
commit | 754a36a58c29718bf5e28b8789b17bffbb60e8a6 (patch) | |
tree | e0772eb7f3248ce030b52774e57f510f85933d58 /drivers/spi/spi-fsl-dspi.c | |
parent | Merge branch 'spi-5.5' into spi-linus (diff) | |
parent | dt-binding: spi: add NPCM PSPI reset binding (diff) | |
download | linux-dev-754a36a58c29718bf5e28b8789b17bffbb60e8a6.tar.xz linux-dev-754a36a58c29718bf5e28b8789b17bffbb60e8a6.zip |
Merge branch 'spi-5.6' into spi-next
Diffstat (limited to 'drivers/spi/spi-fsl-dspi.c')
-rw-r--r-- | drivers/spi/spi-fsl-dspi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 8428b69c858b..6ec2dcb8c57a 100644 --- 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; } |