Commit eee16d21 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mauro Carvalho Chehab
Browse files

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: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 858eff03

drivers/media/platform/pxa_camera.c

+10 −10
Original line number Diff line number Diff line
@@ -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;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE