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

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

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



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

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: default avatarScott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6ec735df

drivers/media/platform/blackfin/bfin_capture.c

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

	}