media: rcar_drif: fix error return code in rcar_drif_alloc_dmachannels()
authorWei Yongjun <weiyongjun1@huawei.com>
Wed, 17 Jan 2018 11:24:52 +0000 (06:24 -0500)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Mon, 26 Feb 2018 12:43:29 +0000 (07:43 -0500)
Fix to return error code -ENODEV from the dma_request_slave_channel()
error handling case instead of 0, as done elsewhere in this function.
rc can be overwrite to 0 by dmaengine_slave_config() in the for loop.

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Ramesh Shanmugasundaram <Ramesh.shanmugasundaram@bp.renesas.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/rcar_drif.c

index b2e080e..dc7e280 100644 (file)
@@ -274,7 +274,7 @@ static int rcar_drif_alloc_dmachannels(struct rcar_drif_sdr *sdr)
 {
        struct dma_slave_config dma_cfg;
        unsigned int i;
-       int ret = -ENODEV;
+       int ret;
 
        for_each_rcar_drif_channel(i, &sdr->cur_ch_mask) {
                struct rcar_drif *ch = sdr->ch[i];
@@ -282,6 +282,7 @@ static int rcar_drif_alloc_dmachannels(struct rcar_drif_sdr *sdr)
                ch->dmach = dma_request_slave_channel(&ch->pdev->dev, "rx");
                if (!ch->dmach) {
                        rdrif_err(sdr, "ch%u: dma channel req failed\n", i);
+                       ret = -ENODEV;
                        goto dmach_error;
                }