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

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

[media] davinci: vpfe: fix error return code in vpfe_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 avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 39e219d9

drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c

+4 −2
Original line number Diff line number Diff line
@@ -639,7 +639,8 @@ static int vpfe_probe(struct platform_device *pdev) 
	if (ret)

		goto probe_free_dev_mem;



	if (vpfe_initialize_modules(vpfe_dev, pdev))

	ret = vpfe_initialize_modules(vpfe_dev, pdev);

	if (ret)

		goto probe_disable_clock;



	vpfe_dev->media_dev.dev = vpfe_dev->pdev;
@@ -663,7 +664,8 @@ static int vpfe_probe(struct platform_device *pdev) 
	/* set the driver data in platform device */

	platform_set_drvdata(pdev, vpfe_dev);

	/* register subdevs/entities */

	if (vpfe_register_entities(vpfe_dev))

	ret = vpfe_register_entities(vpfe_dev);

	if (ret)

		goto probe_out_v4l2_unregister;



	ret = vpfe_attach_irq(vpfe_dev);