openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: pxa_camera: 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>
This commit is contained in:
Peter Ujfalusi 2019-12-17 11:39:23 +01:00 committed by Mauro Carvalho Chehab
parent 858eff0357
commit eee16d210c
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/media/platform/pxa_camera.c
View File

@ -2440,23 +2440,23 @@ static int pxa_camera_probe(struct platform_device *pdev)
pcdev->base = base;
/* request dma */
pcdev->dma_chans[0] = dma_request_slave_channel(&pdev->dev, "CI_Y");
if (!pcdev->dma_chans[0]) {
pcdev->dma_chans[0] = dma_request_chan(&pdev->dev, "CI_Y");
if (IS_ERR(pcdev->dma_chans[0])) {
dev_err(&pdev->dev, "Can't request DMA for Y\n");
return -ENODEV;
return PTR_ERR(pcdev->dma_chans[0]);
}
pcdev->dma_chans[1] = dma_request_slave_channel(&pdev->dev, "CI_U");
if (!pcdev->dma_chans[1]) {
dev_err(&pdev->dev, "Can't request DMA for Y\n");
err = -ENODEV;
pcdev->dma_chans[1] = dma_request_chan(&pdev->dev, "CI_U");
if (IS_ERR(pcdev->dma_chans[1])) {
dev_err(&pdev->dev, "Can't request DMA for U\n");
err = PTR_ERR(pcdev->dma_chans[1]);
goto exit_free_dma_y;
}
pcdev->dma_chans[2] = dma_request_slave_channel(&pdev->dev, "CI_V");
if (!pcdev->dma_chans[2]) {
pcdev->dma_chans[2] = dma_request_chan(&pdev->dev, "CI_V");
if (IS_ERR(pcdev->dma_chans[2])) {
dev_err(&pdev->dev, "Can't request DMA for V\n");
err = -ENODEV;
err = PTR_ERR(pcdev->dma_chans[2]);
goto exit_free_dma_u;
}