Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2755e11 authored by Wei Yongjun's avatar Wei Yongjun Committed by Mauro Carvalho Chehab
Browse files

[media] pxa_camera: fix error return code in pxa_camera_probe() 



Fix to return error code -ENODEV from dma_request_slave_channel_compat()
error handling case instead of 0, as done elsewhere in this function.

Also fix to release resources in v4l2_clk_register() error handling.

Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent e4011b69

drivers/media/platform/pxa_camera.c

+6 −2
Original line number Diff line number Diff line
@@ -2402,6 +2402,7 @@ static int pxa_camera_probe(struct platform_device *pdev) 
						 &params, &pdev->dev, "CI_U");

	if (!pcdev->dma_chans[1]) {

		dev_err(&pdev->dev, "Can't request DMA for Y\n");

		err = -ENODEV;

		goto exit_free_dma_y;

	}
@@ -2411,6 +2412,7 @@ static int pxa_camera_probe(struct platform_device *pdev) 
						 &params, &pdev->dev, "CI_V");

	if (!pcdev->dma_chans[2]) {

		dev_err(&pdev->dev, "Can't request DMA for V\n");

		err = -ENODEV;

		goto exit_free_dma_u;

	}
@@ -2461,8 +2463,10 @@ static int pxa_camera_probe(struct platform_device *pdev) 


		pcdev->mclk_clk = v4l2_clk_register(&pxa_camera_mclk_ops,

						    clk_name, NULL);

		if (IS_ERR(pcdev->mclk_clk))

			return PTR_ERR(pcdev->mclk_clk);

		if (IS_ERR(pcdev->mclk_clk)) {

			err = PTR_ERR(pcdev->mclk_clk);

			goto exit_free_v4l2dev;

		}

	}



	err = v4l2_async_notifier_register(&pcdev->v4l2_dev, &pcdev->notifier);