diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2019-12-17 11:40:25 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-02-24 16:04:49 +0100 |
| commit | 1b5482e0d2680da7202d29013f6b5aa5e203046f (patch) | |
| tree | 0ac221e3ef6d8aa16bb2e94eb7cfb1825bd46579 /drivers/media/platform/rcar_drif.c | |
| parent | media: pxa_camera: Use dma_request_chan() instead dma_request_slave_channel() (diff) | |
| download | linux-1b5482e0d2680da7202d29013f6b5aa5e203046f.tar.xz linux-1b5482e0d2680da7202d29013f6b5aa5e203046f.zip | |
media: rcar_drif: Use dma_request_chan() instead dma_request_slave_channel()
dma_request_slave_channel() is a wrapper on top of dma_request_chan()
eating up the error code.
By using dma_request_chan() directly the driver can support deferred
probing against DMA.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/media/platform/rcar_drif.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/rcar_drif.c b/drivers/media/platform/rcar_drif.c index 0f267a237b42..02ee0e2a09e9 100644 --- a/drivers/media/platform/rcar_drif.c +++ b/drivers/media/platform/rcar_drif.c @@ -275,10 +275,10 @@ static int rcar_drif_alloc_dmachannels(struct rcar_drif_sdr *sdr) for_each_rcar_drif_channel(i, &sdr->cur_ch_mask) { struct rcar_drif *ch = sdr->ch[i]; - ch->dmach = dma_request_slave_channel(&ch->pdev->dev, "rx"); - if (!ch->dmach) { + ch->dmach = dma_request_chan(&ch->pdev->dev, "rx"); + if (IS_ERR(ch->dmach)) { rdrif_err(sdr, "ch%u: dma channel req failed\n", i); - ret = -ENODEV; + ret = PTR_ERR(ch->dmach); goto dmach_error; } |