lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] blackfin: fix error return code in bcap_probe()

Browse Source 
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Scott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Wei Yongjun 2013-05-13 04:52:16 -03:00 committed by Mauro Carvalho Chehab
parent 6ec735df78
commit d9fdbeff26
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/platform/blackfin/bfin_capture.c
View File

@ -974,7 +974,7 @@ static int bcap_probe(struct platform_device *pdev)
int ret;
config = pdev->dev.platform_data;
if (!config) {
if (!config || !config->num_inputs) {
v4l2_err(pdev->dev.driver, "Unable to get board config\n");
return -ENODEV;
}
@ -1081,11 +1081,6 @@ static int bcap_probe(struct platform_device *pdev)
NULL);
if (bcap_dev->sd) {
int i;
if (!config->num_inputs) {
v4l2_err(&bcap_dev->v4l2_dev,
"Unable to work without input\n");
goto err_unreg_vdev;
}
/* update tvnorms from the sub devices */
for (i = 0; i < config->num_inputs; i++)
@ -1093,6 +1088,7 @@ static int bcap_probe(struct platform_device *pdev)
} else {
v4l2_err(&bcap_dev->v4l2_dev,
"Unable to register sub device\n");
ret = -ENODEV;
goto err_unreg_vdev;
}