Skip to content

Commit

Permalink
[media] davinci: vpfe: fix error return code in vpfe_probe()
Browse files Browse the repository at this point in the history
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: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Wei Yongjun authored and Mauro Carvalho Chehab committed May 21, 2013
1 parent 39e219d commit 96f83b3
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down

0 comments on commit 96f83b3

Please sign in to comment.