Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-05 03:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Wei Yongjun <weiyongjun1@huawei.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 2016-09-14 23:21:45 -03:00 committed by Mauro Carvalho Chehab
parent e4011b69ab
commit a2755e1178
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);