OSDN Git Service

media: rcar_drif: Use dma_request_chan() instead dma_request_slave_channel()
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Tue, 17 Dec 2019 10:40:25 +0000 (11:40 +0100)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Mon, 24 Feb 2020 15:04:49 +0000 (16:04 +0100)
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>
drivers/media/platform/rcar_drif.c

index 0f267a2..02ee0e2 100644 (file)
@@ -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;
                }