leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: rcar_drif: fix error return code in rcar_drif_alloc_dmachannels()

Browse Source 
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>
This commit is contained in:
Wei Yongjun 2018-01-17 06:24:52 -05:00 committed by Mauro Carvalho Chehab
parent 8a695a6cfa
commit 648f828c1f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/platform/rcar_drif.c
View File

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